Merge pull request #21 from terraform-ibm-modules/docupdates

doc: badge update

Author: vburckhardt

.github/workflows/ci.yml

@@ -15,3 +15,7 @@ jobs:
   call-terraform-ci-pipeline:
     uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci.yml@v1.7.3
     secrets: inherit
+    with:
+      craTarget: "examples/complete"
+      craGoalIgnoreFile: "cra-tf-validate-ignore-goals.json"
+      craEnvironmentVariables: "TF_VAR_existing_at_instance_crn=crn:v1:bluemix:public:logdnaat:eu-de:a/abac0df06b644a9cabc6e44f55b3880e:b1ef3365-dfbf-4d8f-8ac8-75f4f84d6f4a::"

README.md

@@ -3,7 +3,7 @@
 <!-- Update the title to match the module name and add a description -->
 # IBM Cloud Databases for ICD Postgresql module
 <!-- UPDATE BADGE: Update the link for the following badge-->
-[![Incubating (Not yet consumable)](https://img.shields.io/badge/status-Incubating%20(Not%20yet%20consumable)-red)](https://terraform-ibm-modules.github.io/documentation/#/badge-status)
+[![Stable (With quality checks)](https://img.shields.io/badge/Status-Stable%20(With%20quality%20checks)-green?style=plastic)](https://terraform-ibm-modules.github.io/documentation/#/badge-status)
 [![Build status](https://github.com/terraform-ibm-modules/terraform-ibm-module-template/actions/workflows/ci.yml/badge.svg)](https://github.com/terraform-ibm-modules/terraform-ibm-module-template/actions/workflows/ci.yml)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 [![latest release](https://img.shields.io/github/v/release/terraform-ibm-modules/terraform-ibm-icd-postgresql?logo=GitHub&sort=semver)](https://github.com/terraform-ibm-modules/terraform-ibm-icd-postgresql/releases/latest)

cra-tf-validate-ignore-goals.json

@@ -0,0 +1,16 @@
+{
+    "scc_goals": [
+        {
+            "scc_goal_id": "3000225",
+            "description": "Check whether Databases for PostgreSQL network access is restricted to a specific IP range",
+            "ignore_reason": "Tracking in https://github.ibm.com/GoldenEye/issues/issues/3635",
+            "is_valid": true
+        },
+        {
+            "scc_goal_id": "3000408",
+            "description": "Check whether Flow Logs for VPC are enabled",
+            "ignore_reason": "This is part of the test example and not the current module",
+            "is_valid": false
+        }
+    ]
+}

examples/complete/main.tf

@@ -89,7 +89,7 @@ module "postgresql_db" {
   resource_tags       = var.resource_tags
   cbr_rules = [
     {
-      name             = "${var.prefix}-${var.pg_version}postgres-zone"
+      name             = var.pg_version == null ? "${var.prefix}-postgres-zone" : "${var.prefix}-${var.pg_version}-postgres-zone"
       description      = "sample rule"
       enforcement_mode = "enabled" #Postgresql does not support report mode
       account_id       = data.ibm_iam_account_settings.iam_account_settings.account_id

tests/pr_test.go

@@ -75,9 +75,6 @@ func TestRunCompleteExample(t *testing.T) {
 func TestRunUpgradeExample(t *testing.T) {
 	t.Parallel()
 
-	// TODO: Remove this line after the first merge to primary branch is complete to enable upgrade test
-	t.Skip("Skipping upgrade test until initial code is in primary branch")
-
 	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
 		Testing:       t,
 		TerraformDir:  defaultExampleTerraformDir,