feat: added support to enable the secrets manager public cert engine

ibm_catalog.json

@@ -239,9 +239,20 @@
 						{
 							"key": "existing_secrets_endpoint_type",
 							"type": "string",
-							"default_value": "__NULL__",
-							"description": "The endpoint type to use if existing_secrets_manager_crn is specified.",
-							"required": false
+							"default_value": "private",
+							"description": "The endpoint type to use if `existing_secrets_manager_crn` is specified.",
+							"required": false,
+							"options": [
+								{
+									"displayname": "public",
+									"value": "public"
+								},
+								{
+									"displayname": "private",
+									"value": "private"
+								}
+							]
+
 						},
 						{
 							"key": "sm_service_plan",
@@ -271,36 +282,37 @@
 							"key": "secret_manager_public_engine_enabled",
 							"type": "boolean",
 							"default_value": false,
-							"description": "Set this to true to configure a Secrets Manager public certificate engine for an existing Secrets Manager instance. If set to false, no public certificate engine will be configured for your instance.",
+							"description": "Whether to configure a Secrets Manager public certificate engine for an existing Secrets Manager instance. If `false`, no public certificate engine is configured for your instance.",
 							"required": false
 						},
 						{
 							"key": "cis_id",
 							"type": "string",
 							"default_value": "__NULL__",
-							"description": "Cloud Internet Service ID.",
+							"description": "Cloud Internet Service ID. Required if `secret_manager_public_engine_enabled` is set to true.",
 							"required": false
 						},
 						{
 							"key": "ca_name",
 							"type": "string",
-							"default_value": "cert-auth",
-							"description": "The name of the certificate authority for Secrets Manager.",
+							"default_value": "__NULL__",
+							"description": "The name of the certificate authority for Secrets Manager. Required if `secret_manager_public_engine_enabled` is set to true.",
 							"required": false
 						},
 						{
 							"key": "dns_provider_name",
 							"type": "string",
-							"default_value": "certificate-dns",
-							"description": "The name of the DNS provider for the public certificate secrets engine configuration.",
+							"default_value": "__NULL__",
+							"description": "The name of the DNS provider for the public certificate secrets engine configuration. Required if `secret_manager_public_engine_enabled` is set to true.",
 							"required": false
 						},
 						{
 							"key": "acme_letsencrypt_private_key",
 							"type": "string",
 							"default_value": "__NULL__",
-							"description": "The private key generated by the ACME account creation tool.",
-							"required": false
+							"description": "The private key generated by the ACME account creation tool. For more information, see [documentation](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-prepare-order-certificates)",
+							"required": false,
+							"sensitive": true
 						},
 						{
 							"key": "scc_service_plan",

stack_definition.json

@@ -79,62 +79,62 @@
       "default": "security-compliance-center-standard-plan",
       "custom_config": {}
     },
-	{
-		"name": "secret_manager_iam_engine_enabled",
-		"required": false,
-		"type": "boolean",
-		"hidden": false,
-		"default": false,
-    "custom_config": {}
-	},
-  {
-    "name": "secret_manager_public_engine_enabled",
-		"required": false,
-		"type": "boolean",
-		"hidden": false,
-		"default": false,
-    "custom_config": {}
-  },
-  {
-    "name": "existing_secrets_endpoint_type",
-		"required": false,
-		"type": "string",
-		"hidden": false,
-		"default": "__NULL__",
-    "custom_config": {}
-  },
-  {
-    "name": "cis_id",
-		"required": false,
-		"type": "string",
-		"hidden": false,
-		"default": "__NULL__",
-    "custom_config": {}
-  },
-  {
-    "name": "ca_name",
-		"required": false,
-		"type": "string",
-		"hidden": false,
-		"default": "__NULL__",
-    "custom_config": {}
-  },
-  {
-    "name": "dns_provider_name",
-		"required": false,
-		"type": "string",
-		"hidden": false,
-		"default": "__NULL__",
-    "custom_config": {}
-  },
-  {
-    "name": "acme_letsencrypt_private_key",
-		"required": false,
-		"type": "string",
-		"hidden": true,
-		"default": "__NULL__",
-    "custom_config": {}
-  }
+    {
+      "name": "secret_manager_iam_engine_enabled",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "secret_manager_public_engine_enabled",
+      "required": false,
+      "type": "boolean",
+      "hidden": false,
+      "default": false,
+      "custom_config": {}
+    },
+    {
+      "name": "existing_secrets_endpoint_type",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "private",
+      "custom_config": {}
+    },
+    {
+      "name": "cis_id",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "__NULL__",
+      "custom_config": {}
+    },
+    {
+      "name": "ca_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "__NULL__",
+      "custom_config": {}
+    },
+    {
+      "name": "dns_provider_name",
+      "required": false,
+      "type": "string",
+      "hidden": false,
+      "default": "__NULL__",
+      "custom_config": {}
+    },
+    {
+      "name": "acme_letsencrypt_private_key",
+      "required": false,
+      "type": "string",
+      "hidden": true,
+      "default": "__NULL__",
+      "custom_config": {}
+    }
   ],
   "members": [
     {

tests/pr_test.go

@@ -28,6 +28,8 @@ const yamlLocation = "../common-dev-assets/common-go-assets/common-permanent-res
 
 var permanentResources map[string]interface{}
 
+var acme_letsencrypt_private_key *string
+
 // Current supported regions
 var validRegions = []string{
 	"us-south",
@@ -39,6 +41,13 @@ func TestMain(m *testing.M) {
 	// Read the YAML file contents
 	var err error
 	permanentResources, err = common.LoadMapFromYaml(yamlLocation)
+
+	acme_letsencrypt_private_key = GetSecretsManagerKey( // pragma: allowlist secret
+		permanentResources["acme_letsencrypt_private_key_sm_id"].(string),
+		permanentResources["acme_letsencrypt_private_key_sm_region"].(string),
+		permanentResources["acme_letsencrypt_private_key_secret_id"].(string),
+	)
+
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -49,12 +58,6 @@ func TestMain(m *testing.M) {
 func TestProjectsFullTest(t *testing.T) {
 	t.Parallel()
 
-	acme_letsencrypt_private_key := GetSecretsManagerKey( // pragma: allowlist secret
-		permanentResources["acme_letsencrypt_private_key_sm_id"].(string),
-		permanentResources["acme_letsencrypt_private_key_sm_region"].(string),
-		permanentResources["acme_letsencrypt_private_key_secret_id"].(string),
-	)
-
 	options := testprojects.TestProjectOptionsDefault(&testprojects.TestProjectsOptions{
 		Testing:        t,
 		Prefix:         "cs", // setting prefix here gets a random string appended to it
@@ -111,12 +114,6 @@ func GetSecretsManagerKey(sm_id string, sm_region string, sm_key_id string) *str
 func TestProjectsExistingResourcesTest(t *testing.T) {
 	t.Parallel()
 
-	acme_letsencrypt_private_key := GetSecretsManagerKey( // pragma: allowlist secret
-		permanentResources["acme_letsencrypt_private_key_sm_id"].(string),
-		permanentResources["acme_letsencrypt_private_key_sm_region"].(string),
-		permanentResources["acme_letsencrypt_private_key_secret_id"].(string),
-	)
-
 	// ------------------------------------------------------------------------------------
 	// Provision RG, EN and SM
 	// ------------------------------------------------------------------------------------