Skip to content

fix: remove endpoint variables #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix: remove endpoint variables #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48e8faf
fix: remove endpoint variables, hardcode module to private
MatthewLemmond Nov 5, 2024
834a434
refactor: remove the variables from being passed in to tests
MatthewLemmond Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions solutions/standard/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ module "kms" {
create_key_protect_instance = false
region = local.kms_region
existing_kms_instance_crn = var.existing_kms_instance_crn
key_ring_endpoint_type = var.kms_endpoint_type
key_endpoint_type = var.kms_endpoint_type
key_ring_endpoint_type = "private"
key_endpoint_type = "private"
keys = [
{
key_ring_name = local.kms_key_ring_name
Expand All @@ -96,7 +96,7 @@ locals {
secrets_manager_guid = var.existing_secrets_manager_crn != null ? (length(local.parsed_existing_secrets_manager_crn) > 0 ? local.parsed_existing_secrets_manager_crn[7] : null) : module.secrets_manager.secrets_manager_guid
secrets_manager_crn = var.existing_secrets_manager_crn != null ? var.existing_secrets_manager_crn : module.secrets_manager.secrets_manager_crn
secrets_manager_region = var.existing_secrets_manager_crn != null ? (length(local.parsed_existing_secrets_manager_crn) > 0 ? local.parsed_existing_secrets_manager_crn[5] : null) : module.secrets_manager.secrets_manager_region
sm_endpoint_type = var.existing_secrets_manager_crn != null ? var.existing_secrets_endpoint_type : var.allowed_network == "private-only" ? "private" : "public"
sm_endpoint_type = "private"
}

module "secrets_manager" {
Expand All @@ -107,7 +107,7 @@ module "secrets_manager" {
region = var.region
secrets_manager_name = var.prefix != null ? "${var.prefix}-${var.secrets_manager_instance_name}" : var.secrets_manager_instance_name
sm_service_plan = var.service_plan
allowed_network = var.allowed_network
allowed_network = "private-only"
sm_tags = var.secret_manager_tags
# kms dependency
kms_encryption_enabled = true
Expand Down
30 changes: 0 additions & 30 deletions solutions/standard/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,6 @@ variable "existing_secrets_manager_crn" {
default = null
}

variable "existing_secrets_endpoint_type" {
type = string
description = "The endpoint type to use if existing_secrets_manager_crn is specified. Possible values: public, private."
default = "private"
validation {
condition = contains(["public", "private"], var.existing_secrets_endpoint_type)
error_message = "Only \"public\" and \"private\" are allowed values for 'existing_secrets_endpoint_type'."
}
}

variable "service_plan" {
type = string
description = "The pricing plan to use when provisioning a Secrets Manager instance. Possible values: `standard`, `trial`. Applies only if `provision_sm_instance` is set to `true`."
Expand All @@ -68,16 +58,6 @@ variable "service_plan" {
}
}

variable "allowed_network" {
type = string
description = "The types of service endpoints to set on the Secrets Manager instance. Possible values: `private-only`, `public-and-private`."
default = "private-only"
validation {
condition = contains(["private-only", "public-and-private"], var.allowed_network)
error_message = "The specified allowed_network is not a valid selection."
}
}

variable "secret_manager_tags" {
type = list(any)
description = "The list of resource tags you want to associate with your Secrets Manager instance."
Expand Down Expand Up @@ -213,16 +193,6 @@ variable "existing_kms_instance_crn" {
description = "The CRN of the KMS instance (Hyper Protect Crypto Services or Key Protect). Required only if `existing_secrets_manager_crn` or `existing_secrets_manager_kms_key_crn` is not specified. If the KMS instance is in different account you must also provide a value for `ibmcloud_kms_api_key`."
}

variable "kms_endpoint_type" {
type = string
description = "The type of endpoint to use for communicating with the Key Protect or Hyper Protect Crypto Services instance. Possible values: `public`, `private`. Applies only if `existing_secrets_manager_kms_key_crn` is not specified."
default = "private"
validation {
condition = can(regex("public|private", var.kms_endpoint_type))
error_message = "The kms_endpoint_type value must be 'public' or 'private'."
}
}

variable "kms_key_ring_name" {
type = string
default = "sm-cos-key-ring"
Expand Down
3 changes: 0 additions & 3 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ func TestRunExistingResourcesInstances(t *testing.T) {
"existing_secrets_manager_crn": terraform.Output(t, existingTerraformOptions, "secrets_manager_instance_crn"),
"iam_engine_enabled": true,
"private_engine_enabled": true,
"existing_secrets_endpoint_type": "public",
},
})

Expand Down Expand Up @@ -229,8 +228,6 @@ func TestRunExistingResourcesInstances(t *testing.T) {
"service_plan": "trial",
"iam_engine_enabled": true,
"private_engine_enabled": true,
"existing_secrets_endpoint_type": "public",
"allowed_network": "public-and-private",
},
})

Expand Down