Ce projects da

.catalog-onboard-pipeline.yaml

@@ -12,3 +12,9 @@ offerings:
         scc:
           instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
           region: us-south
+      - name: projects
+        mark_ready: true
+        install_type: fullstack
+        scc:
+          instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
+          region: us-south

ibm_catalog.json

@@ -119,6 +119,45 @@
               }
             ]
           }
+        },
+        {
+            "label": "New Code Engine projects",
+            "name": "projects",
+            "install_type": "fullstack",
+            "working_directory": "solutions/projects",
+            "iam_permissions": [
+                {
+                "role_crns": [
+                    "crn:v1:bluemix:public:iam::::serviceRole:Writer"
+                ],
+                "service_name": "codeengine"
+                },
+                {
+                "role_crns": [
+                    "crn:v1:bluemix:public:iam::::role:Editor"
+                ],
+                "service_name": "codeengine"
+                }
+            ],
+            "architecture": {
+                "descriptions": "This deployable architecture creates IBM Cloud Code Engine projects",
+                "features": [
+                {
+                    "title": "IBM Cloud Code Engine project",
+                    "description": "Yes"
+                }
+                ],
+                "diagrams": [
+                {
+                    "diagram": {
+                    "caption": "IBM Cloud Code Engine application solution.",
+                    "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-code-engine/main/reference-architecture/ce-projects-da.svg",
+                    "type": "image/svg+xml"
+                    },
+                    "description": "This deployable architecture creates IBM Cloud Code Engine projects"
+                }
+                ]
+            }
         }
       ]
     }

solutions/projects/README.md

@@ -0,0 +1,7 @@
+# IBM Cloud Code Engine projects deployable architecture
+
+This deployable architecture creates IBM Cloud Code Engine projects and the following optional resources:
+
+- A resource group.
+
+![ce-apps-da](../../reference-architecture/ce-projects-da.svg)

solutions/projects/catalogValidationValues.json.template

@@ -0,0 +1,8 @@
+{
+  "ibmcloud_api_key": $VALIDATION_APIKEY,
+  "resource_group_name": $PREFIX,
+  "prefix": $PREFIX,
+  "project_names": [
+    $PREFIX
+  ]
+}

solutions/projects/main.tf

@@ -0,0 +1,30 @@
+locals {
+  # add prefix to all projects created by this solution if prefix is not null
+  projects = [
+    for project in var.project_names : (
+      var.prefix != null ? "${var.prefix}-${project}" : project
+    )
+  ]
+}
+
+########################################################################################################################
+# Resource group
+########################################################################################################################
+
+module "resource_group" {
+  source                       = "terraform-ibm-modules/resource-group/ibm"
+  version                      = "1.1.6"
+  resource_group_name          = var.existing_resource_group == false ? var.resource_group_name : null
+  existing_resource_group_name = var.existing_resource_group == true ? var.resource_group_name : null
+}
+
+########################################################################################################################
+# Code Engine Projects
+########################################################################################################################
+
+module "project" {
+  for_each          = toset(local.projects)
+  source            = "../../modules/project"
+  name              = each.value
+  resource_group_id = module.resource_group.resource_group_id
+}

solutions/projects/outputs.tf

@@ -0,0 +1,60 @@
+########################################################################################################################
+# Outputs
+########################################################################################################################
+
+output "project_name_id_map" {
+  description = "Map of project names to their corresponding IDs."
+  value       = { for p in module.project : p.name => p.project_id }
+}
+
+# IBM Projects Stacks do not support complex outputs at this time,
+# As a workaround, we will output the first 5 projects individually. If a project does not exist, the output will be null.
+output "project_1_name" {
+  description = "Name of the first project."
+  value       = length(values(module.project)) > 0 ? values(module.project)[0].name : null
+}
+
+output "project_1_id" {
+  description = "ID of the first project."
+  value       = length(values(module.project)) > 0 ? values(module.project)[0].project_id : null
+}
+
+output "project_2_name" {
+  description = "Name of the second project."
+  value       = length(values(module.project)) > 1 ? values(module.project)[1].name : null
+}
+
+output "project_2_id" {
+  description = "ID of the second project."
+  value       = length(values(module.project)) > 1 ? values(module.project)[1].project_id : null
+}
+
+output "project_3_name" {
+  description = "Name of the third project."
+  value       = length(values(module.project)) > 2 ? values(module.project)[2].name : null
+}
+
+output "project_3_id" {
+  description = "ID of the third project."
+  value       = length(values(module.project)) > 2 ? values(module.project)[2].project_id : null
+}
+
+output "project_4_name" {
+  description = "Name of the fourth project."
+  value       = length(values(module.project)) > 3 ? values(module.project)[3].name : null
+}
+
+output "project_4_id" {
+  description = "ID of the fourth project."
+  value       = length(values(module.project)) > 3 ? values(module.project)[3].project_id : null
+}
+
+output "project_5_name" {
+  description = "Name of the fifth project."
+  value       = length(values(module.project)) > 4 ? values(module.project)[4].name : null
+}
+
+output "project_5_id" {
+  description = "ID of the fifth project."
+  value       = length(values(module.project)) > 4 ? values(module.project)[4].project_id : null
+}

solutions/projects/provider.tf

@@ -0,0 +1,8 @@
+########################################################################################################################
+# Provider config
+########################################################################################################################
+
+provider "ibm" {
+  ibmcloud_api_key = var.ibmcloud_api_key
+  region           = var.region
+}

solutions/projects/variables.tf

@@ -0,0 +1,38 @@
+########################################################################################################################
+# Input variables
+########################################################################################################################
+
+variable "ibmcloud_api_key" {
+  type        = string
+  description = "The IBM Cloud API key."
+  sensitive   = true
+}
+
+variable "prefix" {
+  type        = string
+  description = "Prefix to added to all projects created by this solution."
+  default     = null
+  nullable    = true
+}
+
+variable "region" {
+  type        = string
+  description = "The region in which to provision all resources created by this solution."
+  default     = "us-south"
+}
+
+variable "existing_resource_group" {
+  type        = bool
+  description = "Whether to use an existing resource group."
+  default     = false
+}
+
+variable "resource_group_name" {
+  type        = string
+  description = "The name of a new or an existing resource group to provision the IBM Cloud Code Engine resources to."
+}
+
+variable "project_names" {
+  description = "The names of the projects to add the IBM Cloud Code Engine."
+  type        = list(string)
+}

solutions/projects/version.tf

@@ -0,0 +1,10 @@
+
+terraform {
+  required_version = ">= 1.3.0"
+  required_providers {
+    ibm = {
+      source  = "IBM-Cloud/ibm"
+      version = "1.68.1"
+    }
+  }
+}

tests/pr_test.go

@@ -173,3 +173,24 @@ func TestRunUpgradeAppSolution(t *testing.T) {
 		assert.NotNil(t, output, "Expected some output")
 	}
 }
+
+func TestDeployCEProjectsDA(t *testing.T) {
+	t.Parallel()
+
+	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
+		Testing:      t,
+		TerraformDir: "solutions/projects",
+		Prefix:       "ce-da",
+	})
+
+	options.TerraformVars = map[string]interface{}{
+		"resource_group_name":     resourceGroup,
+		"existing_resource_group": true,
+		"prefix":                  options.Prefix,
+		"project_names":           "[\"test-1\", \"test-2\"]",
+	}
+
+	output, err := options.RunTestConsistency()
+	assert.Nil(t, err, "This should not have errored")
+	assert.NotNil(t, output, "Expected some output")
+}