fix: added a fix to the project submodule where the CBR "operations" attribute value was not being passed (#175)

Author: akocbek

examples/apps/README.md

@@ -9,4 +9,4 @@ An end-to-end apps example that will provision the following:
 - Code Engine Domain Mapping
 - Secrets Manager Resources (Public Engine, Group, Public Certificate)
 - A Virtual Private Cloud (VPC).
-- A context-based restriction (CBR) rule to allow Code Engine to be accessible from VPC.
+- A context-based restriction (CBR) rule to allow Code Engine to be accessible from VPC and Schematics.

examples/apps/main.tf

@@ -137,6 +137,21 @@ module "cbr_vpc_zone" {
   }]
 }
 
+module "cbr_zone_schematics" {
+  source           = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
+  version          = "1.29.0"
+  name             = "${var.prefix}-schematics-zone"
+  zone_description = "CBR Network zone containing Schematics"
+  account_id       = data.ibm_iam_account_settings.iam_account_settings.account_id
+  addresses = [{
+    type = "serviceRef",
+    ref = {
+      account_id   = data.ibm_iam_account_settings.iam_account_settings.account_id
+      service_name = "schematics"
+    }
+  }]
+}
+
 ########################################################################################################################
 # Code Engine instance
 ########################################################################################################################
@@ -148,7 +163,7 @@ module "code_engine" {
   project_name      = "${var.prefix}-project"
   cbr_rules = [
     {
-      description      = "${var.prefix}-code engine access only from vpc"
+      description      = "${var.prefix}-code engine access"
       enforcement_mode = "enabled"
       account_id       = data.ibm_iam_account_settings.iam_account_settings.account_id
       rule_contexts = [{
@@ -161,6 +176,18 @@ module "code_engine" {
             name  = "networkZoneId"
             value = module.cbr_vpc_zone.zone_id
         }]
+        },
+        {
+          attributes = [
+            {
+              name  = "networkZoneId"
+              value = module.cbr_zone_schematics.zone_id
+          }]
+      }]
+      operations = [{
+        api_types = [{
+          api_type_id = "crn:v1:bluemix:public:context-based-restrictions::::platform-api-type:"
+        }]
       }]
     }
   ]

modules/project/main.tf

@@ -20,6 +20,7 @@ module "cbr_rules" {
   rule_description = var.cbr_rules[count.index].description
   enforcement_mode = var.cbr_rules[count.index].enforcement_mode
   rule_contexts    = var.cbr_rules[count.index].rule_contexts
+  operations       = var.cbr_rules[count.index].operations
   resources = [{
     attributes = [
       {

solutions/apps/DA-cbr_rules.md

@@ -54,7 +54,7 @@ cbr_rules = [
   enforcement_mode = "enabled"
   operations = [{
     api_types = [{
-     api_type_id = "crn:v1:bluemix:public:context-based-restrictions::::api-type:"
+     api_type_id = "crn:v1:bluemix:public:context-based-restrictions::::platform-api-type:"
       }]
     }]
   }

solutions/project/DA-cbr_rules.md

@@ -54,7 +54,7 @@ cbr_rules = [
   enforcement_mode = "enabled"
   operations = [{
     api_types = [{
-     api_type_id = "crn:v1:bluemix:public:context-based-restrictions::::api-type:"
+     api_type_id = "crn:v1:bluemix:public:context-based-restrictions::::platform-api-type:"
       }]
     }]
   }

tests/pr_test.go

@@ -34,32 +34,6 @@ func TestMain(m *testing.M) {
 	os.Exit(m.Run())
 }
 
-func setupAppsExampleOptions(t *testing.T, prefix string, terraformDir string) *testhelper.TestOptions {
-	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
-		Testing:       t,
-		TerraformDir:  terraformDir,
-		Prefix:        prefix,
-		ResourceGroup: resourceGroup,
-	})
-	// need to ignore because of a provider issue: https://github.com/IBM-Cloud/terraform-provider-ibm/issues/4719
-	options.IgnoreUpdates = testhelper.Exemptions{
-		List: []string{
-			"module.code_engine.module.app[\"" + options.Prefix + "-app\"].ibm_code_engine_app.ce_app",
-			"module.code_engine.module.app[\"" + options.Prefix + "-app2\"].ibm_code_engine_app.ce_app",
-		},
-	}
-	options.TerraformVars = map[string]interface{}{
-		"resource_group":              resourceGroup,
-		"prefix":                      options.Prefix,
-		"existing_sm_instance_guid":   permanentResources["secretsManagerGuid"],
-		"existing_sm_instance_region": permanentResources["secretsManagerRegion"],
-		"existing_cert_secret_id":     permanentResources["cePublicCertId"],
-		"existing_cert_common_name":   "goldeneye.dev.cloud.ibm.com",
-	}
-
-	return options
-}
-
 func setupJobsExampleOptions(t *testing.T, prefix string, terraformDir string) *testhelper.TestOptions {
 	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
 		Testing:       t,
@@ -82,13 +56,44 @@ func setupJobsExampleOptions(t *testing.T, prefix string, terraformDir string) *
 	return options
 }
 
-func TestRunAppsExample(t *testing.T) {
+func TestRunAppsExamplesInSchematics(t *testing.T) {
 	t.Parallel()
 
-	options := setupAppsExampleOptions(t, "ce-apps", appsExampleDir)
-	output, err := options.RunTestConsistency()
+	options := testschematic.TestSchematicOptionsDefault(&testschematic.TestSchematicOptions{
+		Testing:        t,
+		TemplateFolder: appsExampleDir,
+		Prefix:         "ce-apps",
+		TarIncludePatterns: []string{
+			"*.tf",
+			appsExampleDir + "/*.tf",
+			"modules/app/*.tf",
+			"modules/binding/*.tf",
+			"modules/config_map/*.tf",
+			"modules/project/*.tf",
+			"modules/secret/*.tf",
+			"modules/build/*.tf",
+			"modules/domain_mapping/*.tf",
+			"modules/job/*.tf",
+		},
+		ResourceGroup:          resourceGroup,
+		Tags:                   []string{"test-schematic"},
+		DeleteWorkspaceOnFail:  false,
+		WaitJobCompleteMinutes: 60,
+	})
+
+	options.TerraformVars = []testschematic.TestSchematicTerraformVar{
+		{Name: "ibmcloud_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string", Secure: true},
+		{Name: "resource_group", Value: options.ResourceGroup, DataType: "string"},
+		{Name: "prefix", Value: options.Prefix + "-app", DataType: "string"},
+		{Name: "existing_sm_instance_guid", Value: permanentResources["secretsManagerGuid"], DataType: "string"},
+		{Name: "existing_sm_instance_region", Value: permanentResources["secretsManagerRegion"], DataType: "string"},
+		{Name: "ca_name", Value: permanentResources["certificateAuthorityName"], DataType: "string"},
+		{Name: "dns_provider_name", Value: permanentResources["dnsProviderName"], DataType: "string"},
+		{Name: "region", Value: options.Region, DataType: "string"},
+	}
+
+	err := options.RunSchematicTest()
 	assert.Nil(t, err, "This should not have errored")
-	assert.NotNil(t, output, "Expected some output")
 }
 
 func TestRunJobsExample(t *testing.T) {