Revert "Add support for http observability on vault_cluster resource (#…

…660)" This reverts commit 713bf23.
hashicorp · Nov 7, 2023 · 459ccf9 · 459ccf9
1 parent 713bf23
commit 459ccf9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 410 deletions.
diff --git a/.changelog/660.txt b/.changelog/660.txt
diff --git a/docs/data-sources/vault_cluster.md b/docs/data-sources/vault_cluster.md
@@ -81,16 +81,6 @@ Read-Only:
 - `elasticsearch_user` (String) ElasticSearch user for streaming audit logs
 - `grafana_endpoint` (String) Grafana endpoint for streaming audit logs
 - `grafana_user` (String) Grafana user for streaming audit logs
-- `http_basic_password` (String) HTTP basic authentication password for streaming audit logs, one of the two available authentication methods, can be specified only if http_basic_user is also provided
-- `http_basic_user` (String) HTTP basic authentication username for streaming audit logs, one of the two available authentication methods, can be specified only if http_basic_password is also provided
-- `http_bearer_token` (String) HTTP bearer authentication token for streaming audit logs, one of the two available authentication methods, can be specified only if http_basic_user and http_basic_password are not provided
-- `http_codec` (String) HTTP codec for streaming audit logs, allowed values are JSON and NDJSON
-- `http_compression` (Boolean) HTTP compression flag for streaming audit logs
-- `http_headers` (Map of String) HTTP headers for streaming audit logs
-- `http_method` (String) HTTP payload method for streaming audit logs, allowed values are PATCH, POST, or PUT
-- `http_payload_prefix` (String) HTTP payload prefix for streaming audit logs
-- `http_payload_suffix` (String) HTTP payload suffix for streaming audit logs
-- `http_uri` (String) HTTP URI for streaming audit logs
 - `newrelic_account_id` (String) NewRelic Account ID for streaming audit logs
 - `newrelic_license_key` (String) NewRelic license key for streaming audit logs
 - `newrelic_region` (String) NewRelic region for streaming audit logs, allowed values are "US" and "EU"
@@ -123,16 +113,6 @@ Read-Only:
 - `elasticsearch_user` (String) ElasticSearch user for streaming metrics
 - `grafana_endpoint` (String) Grafana endpoint for streaming metrics
 - `grafana_user` (String) Grafana user for streaming metrics
-- `http_basic_password` (String) HTTP basic authentication password for streaming metrics, one of the two available authentication methods, can be specified only if http_basic_user is also provided
-- `http_basic_user` (String) HTTP basic authentication username for streaming metrics, one of the two available authentication methods, can be specified only if http_basic_password is also provided
-- `http_bearer_token` (String) HTTP bearer authentication token for streaming metrics, one of the two available authentication methods, can be specified only if http_basic_user and http_basic_password are not provided
-- `http_codec` (String) HTTP codec for streaming metrics, allowed values are JSON and NDJSON
-- `http_compression` (Boolean) HTTP compression flag for streaming metrics
-- `http_headers` (Map of String) HTTP headers for streaming metrics
-- `http_method` (String) HTTP payload method for streaming metrics, allowed values are PATCH, POST, or PUT
-- `http_payload_prefix` (String) HTTP payload prefix for streaming metrics
-- `http_payload_suffix` (String) HTTP payload suffix for streaming metrics
-- `http_uri` (String) HTTP URI for streaming metrics
 - `newrelic_account_id` (String) NewRelic Account ID for streaming metrics
 - `newrelic_license_key` (String) NewRelic license key for streaming metrics
 - `newrelic_region` (String) NewRelic region for streaming metrics, allowed values are "US" and "EU"

diff --git a/docs/resources/vault_cluster.md b/docs/resources/vault_cluster.md
@@ -94,16 +94,6 @@ Optional:
 - `grafana_endpoint` (String) Grafana endpoint for streaming audit logs
 - `grafana_password` (String, Sensitive) Grafana password for streaming audit logs
 - `grafana_user` (String) Grafana user for streaming audit logs
-- `http_basic_password` (String, Sensitive) HTTP basic authentication password for streaming audit logs, one of the two available authentication methods, can be specified only if http_basic_user is also provided
-- `http_basic_user` (String) HTTP basic authentication username for streaming audit logs, one of the two available authentication methods, can be specified only if http_basic_password is also provided
-- `http_bearer_token` (String, Sensitive) HTTP bearer authentication token for streaming audit logs, one of the two available authentication methods, can be specified only if http_basic_user and http_basic_password are not provided
-- `http_codec` (String) HTTP codec for streaming audit logs, allowed values are JSON and NDJSON
-- `http_compression` (Boolean) HTTP compression flag for streaming audit logs
-- `http_headers` (Map of String) HTTP headers for streaming audit logs
-- `http_method` (String) HTTP payload method for streaming audit logs, , allowed values are PATCH, POST, or PUT
-- `http_payload_prefix` (String) HTTP payload prefix for streaming audit logs
-- `http_payload_suffix` (String) HTTP payload suffix for streaming audit logs
-- `http_uri` (String) HTTP URI for streaming audit logs
 - `newrelic_account_id` (String) NewRelic Account ID for streaming audit logs
 - `newrelic_license_key` (String, Sensitive) NewRelic license key for streaming audit logs
 - `newrelic_region` (String) NewRelic region for streaming audit logs, allowed values are "US" and "EU"
@@ -146,16 +136,6 @@ Optional:
 - `grafana_endpoint` (String) Grafana endpoint for streaming metrics
 - `grafana_password` (String, Sensitive) Grafana password for streaming metrics
 - `grafana_user` (String) Grafana user for streaming metrics
-- `http_basic_password` (String) HTTP basic authentication password for streaming metrics, one of the two available authentication methods, can be specified only if http_basic_user is also specified
-- `http_basic_user` (String) HTTP basic authentication username for streaming metrics, one of the two available authentication methods, can be specified only if http_basic_password is also specified
-- `http_bearer_token` (String, Sensitive) HTTP bearer authentication token for streaming metrics, one of the two available authentication methods, can be specified only if http_basic_user and http_basic_password are not provided
-- `http_codec` (String) HTTP codec for streaming metrics, allowed values are JSON and NDJSON
-- `http_compression` (Boolean) HTTP compression flag for streaming metrics
-- `http_headers` (Map of String) HTTP headers for streaming metrics
-- `http_method` (String) HTTP payload method for streaming metrics, allowed values are PATCH, POST, or PUT
-- `http_payload_prefix` (String) HTTP payload prefix for streaming metrics
-- `http_payload_suffix` (String) HTTP payload suffix for streaming metrics
-- `http_uri` (String) HTTP URI for streaming metrics
 - `newrelic_account_id` (String) NewRelic Account ID for streaming metrics
 - `newrelic_license_key` (String, Sensitive) NewRelic license key for streaming metrics
 - `newrelic_region` (String) NewRelic region for streaming metrics, allowed values are "US" and "EU"

diff --git a/internal/providersdkv2/data_source_vault_cluster.go b/internal/providersdkv2/data_source_vault_cluster.go
@@ -216,56 +216,6 @@ If a project is not configured in the HCP Provider config block, the oldest proj
 							Type:        schema.TypeString,
 							Computed:    true,
 						},
-						"http_basic_user": {
-							Description: "HTTP basic authentication username for streaming metrics, one of the two available authentication methods, can be specified only if http_basic_password is also provided",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_basic_password": {
-							Description: "HTTP basic authentication password for streaming metrics, one of the two available authentication methods, can be specified only if http_basic_user is also provided",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_bearer_token": {
-							Description: "HTTP bearer authentication token for streaming metrics, one of the two available authentication methods, can be specified only if http_basic_user and http_basic_password are not provided",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_headers": {
-							Description: "HTTP headers for streaming metrics",
-							Type:        schema.TypeMap,
-							Computed:    true,
-						},
-						"http_codec": {
-							Description: "HTTP codec for streaming metrics, allowed values are JSON and NDJSON",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_compression": {
-							Description: "HTTP compression flag for streaming metrics",
-							Type:        schema.TypeBool,
-							Computed:    true,
-						},
-						"http_method": {
-							Description: "HTTP payload method for streaming metrics, allowed values are PATCH, POST, or PUT",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_payload_prefix": {
-							Description: "HTTP payload prefix for streaming metrics",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_payload_suffix": {
-							Description: "HTTP payload suffix for streaming metrics",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_uri": {
-							Description: "HTTP URI for streaming metrics",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
 					},
 				},
 			},
@@ -356,56 +306,6 @@ If a project is not configured in the HCP Provider config block, the oldest proj
 							Type:        schema.TypeString,
 							Computed:    true,
 						},
-						"http_basic_user": {
-							Description: "HTTP basic authentication username for streaming audit logs, one of the two available authentication methods, can be specified only if http_basic_password is also provided",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_basic_password": {
-							Description: "HTTP basic authentication password for streaming audit logs, one of the two available authentication methods, can be specified only if http_basic_user is also provided",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_bearer_token": {
-							Description: "HTTP bearer authentication token for streaming audit logs, one of the two available authentication methods, can be specified only if http_basic_user and http_basic_password are not provided",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_headers": {
-							Description: "HTTP headers for streaming audit logs",
-							Type:        schema.TypeMap,
-							Computed:    true,
-						},
-						"http_codec": {
-							Description: "HTTP codec for streaming audit logs, allowed values are JSON and NDJSON",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_compression": {
-							Description: "HTTP compression flag for streaming audit logs",
-							Type:        schema.TypeBool,
-							Computed:    true,
-						},
-						"http_method": {
-							Description: "HTTP payload method for streaming audit logs, allowed values are PATCH, POST, or PUT",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_payload_prefix": {
-							Description: "HTTP payload prefix for streaming audit logs",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_payload_suffix": {
-							Description: "HTTP payload suffix for streaming audit logs",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
-						"http_uri": {
-							Description: "HTTP URI for streaming audit logs",
-							Type:        schema.TypeString,
-							Computed:    true,
-						},
 					},
 				},
 			},