Merge branch 'main' into main

lechnerc77 · web-flow · commit af52c9e2e584 · 2024-11-05T16:09:59.000+01:00
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -10,7 +10,8 @@
 		"vscode": {
 			"settings": {},
 			"extensions": [
-				"HashiCorp.terraform"
+				"HashiCorp.terraform",
+				"Github.copilot"
 			]
 		},
 		"codespaces": {}
@@ -21,4 +22,4 @@
 	// If you want to use SSO please install xdg-utils in the container
 	//"postCreateCommand": "bash ./.devcontainer/scripts/install-xdg.sh",
 	"remoteUser": "vscode"
-}
+}
diff --git a/.devcontainer/withenvfile/devcontainer.json b/.devcontainer/withenvfile/devcontainer.json
@@ -4,33 +4,16 @@
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	"features": {
 		"ghcr.io/devcontainers/features/terraform:1": {},
-		"ghcr.io/devcontainers/features/github-cli:1": {},
-		"ghcr.io/devcontainers/features/python:1": {},
-		"ghcr.io/devcontainers/features/go:1": {}		
+		"ghcr.io/devcontainers/features/github-cli:1": {}
 	},
 	"customizations": {
 		"vscode": {
 			"extensions": [
-				"ms-python.vscode-pylance",
-				"ms-python.python",
-				"charliermarsh.ruff",
 				"Github.copilot",
 				"HashiCorp.terraform"
 			],
 			// Set *default* container specific settings.json values on container create.
-			"settings": {
-				"python.defaultInterpreterPath": "/usr/local/bin/python",
-				"python.linting.enabled": true,
-				"python.testing.unittestEnabled": false,
-				"python.testing.pytestEnabled": true,
-				"[python]": {
-					"editor.formatOnSave": true,
-					"editor.codeActionsOnSave": {
-						"source.fixAll": "always"
-					}
-				},
-				"python.formatting.provider": "black"
-			}
+			"settings": {}
 		},
 		"codespaces": {}
 	},
@@ -49,5 +32,4 @@
 		".devcontainer/devcontainer.env"
 	],
 	"postStartCommand": "go install github.com/hashicorp/terraform-config-inspect@latest"
-	
-}
+}
diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE1/README.md b/released/dsag/betriebstag2024/exercises/EXERCISE1/README.md
@@ -27,7 +27,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.8.0"
     }
   }
 }
@@ -63,6 +63,6 @@ globalaccount = "<YOUR GLOBAL ACCOUNT SUBDOMAIN>"
 
 ## Summary
 
-You've now created a basic setup of the Terraform provider including its configuration.  
+You've now created a basic setup of the Terraform provider including its configuration.
 
 Continue to - [Exercise 2 - Setup of a subaccount](../EXERCISE2/README.md).
diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE1/SOLUTION_EX1/provider.tf b/released/dsag/betriebstag2024/exercises/EXERCISE1/SOLUTION_EX1/provider.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.8.0"
     }
   }
 
diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE2/SOLUTION_EX2/provider.tf b/released/dsag/betriebstag2024/exercises/EXERCISE2/SOLUTION_EX2/provider.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.8.0"
     }
   }
 
diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE3/README.md b/released/dsag/betriebstag2024/exercises/EXERCISE3/README.md
@@ -76,6 +76,6 @@ You can also check that everything is in place via the SAP BTP cockpit. You shou
 
 ## Summary
 
-You've now successfully assigned emergency administrators to the subaccount.  
+You've now successfully assigned emergency administrators to the subaccount.
 
 Continue to - [# Exercise 4 - Assign entitlements to a subaccount](../EXERCISE4/README.md).
diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE3/SOLUTION_EX3/provider.tf b/released/dsag/betriebstag2024/exercises/EXERCISE3/SOLUTION_EX3/provider.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.8.0"
     }
   }
 
diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE4/SOLUTION_EX4/provider.tf b/released/dsag/betriebstag2024/exercises/EXERCISE4/SOLUTION_EX4/provider.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.8.0"
     }
   }
 
diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE5/SOLUTION_EX5/provider.tf b/released/dsag/betriebstag2024/exercises/EXERCISE5/SOLUTION_EX5/provider.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.8.0"
     }
   }
 
diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE6/README.md b/released/dsag/betriebstag2024/exercises/EXERCISE6/README.md
@@ -44,7 +44,7 @@ For this hands-on we will focus on the *second case*.
 
 Terraform offers dedicated commands in order to adjust the state We will use the `terraform plan -refresh-only` and `terraform apply -refresh-only` commands to detect the drift and adjust the state in Terraform to match the actual state in the SAP BTP cockpit.
 
-First we check the drift with `terraform plan` and add the `--refresh-only` flag to trigger the planning mode for [state replacement](https://developer.hashicorp.com/terraform/cli/commands/plan#planning-modes):
+First we check the drift with `terraform plan` and add the `-refresh-only` flag to trigger the planning mode for [state replacement](https://developer.hashicorp.com/terraform/cli/commands/plan#planning-modes):
 
 ```bash
 terraform plan -refresh-only
diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE7/README.md b/released/dsag/betriebstag2024/exercises/EXERCISE7/README.md
@@ -8,16 +8,12 @@ In this *optional* exercise you will earn how to create a Cloud Foundry environm
 
 We want to create a Cloud Foundry environment in the subaccount. We will not directly use the resources of the Terraform provider for SAP BTP, but leverage a concept called [modules](https://developer.hashicorp.com/terraform/language/modules).
 
-Modules are a way to organize Terraform configurations into reusable components. We have a fitting module for the task at hand in this repository. Navigate to the `modules` folder in the root of this repo and you will find the fitting module at [environments/cloudfoundry/envinstance_cf](../../modules/environment/cloudfoundry/envinstance_cf/README.md).
+Modules are a way to organize Terraform configurations into reusable components. We have a fitting module for the task at hand in this repository. Navigate to the `modules` folder in the root of this repo and you will find the fitting module at [environments/cloudfoundry/envinstance_cf](../../modules/environment/cloudfoundry/envinstance_cf/envinstance_cf.tf).
 
 Inspect the folder and you will see a known file structure:
 
 - `envinstance_cf_variables.tf`: The file contains the input variables for the module.
-- `envinstance_cf.tf`: The file contains the main configuration of the module comprising the resource [`btp_subaccount_environment_instance`](https://registry.terraform.io/providers/SAP/btp/latest/docs/resources/subaccount_environment_instance) of the Terraform Provider for SAP BTP and the resource [`cloudfoundry_org_users`](https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry/latest/docs/resources/org_users) from the Terraform Provider for Cloud Foundry. It corresponds to the `main.tf` file of a Terraform configuration and also contains the required providers.
-
-> [!NOTE]
-> The Terraform provider for Cloud Foundry is a community provider and not maintained by SAP.
-
+- `envinstance_cf.tf`: The file contains the main configuration of the module comprising the resource [`btp_subaccount_environment_instance`](https://registry.terraform.io/providers/SAP/btp/latest/docs/resources/subaccount_environment_instance) of the Terraform Provider for SAP BTP and the resource [`cloudfoundry_org_role`](https://registry.terraform.io/providers/cloudfoundry/cloudfoundry/latest/docs/resources/org_role) from the Terraform Provider for Cloud Foundry. It corresponds to the `main.tf` file of a Terraform configuration and also contains the required providers.
 - `envinstance_cf_outputs.tf`: The file contains the output variables for the module.
 
 When taking a closer look at the `envinstance_cf.tf` file, we see that we do not want to implement these steps again. We will re-use the module to create the Cloud Foundry environment.
@@ -232,6 +228,6 @@ You can also check that everything is in place via the SAP BTP cockpit. You shou
 
 ## Summary
 
-You've now successfully created a Cloud Foundry environment instance as well as a Cloud Foundry space in SAP BTP.  
+You've now successfully created a Cloud Foundry environment instance as well as a Cloud Foundry space in SAP BTP.
 
 Continue to - [Exercise 8 - Cleanup](../EXERCISE8/README.md).
diff --git a/released/dsag/betriebstag2024/exercises/EXERCISE7/SOLUTION_EX7/provider.tf b/released/dsag/betriebstag2024/exercises/EXERCISE7/SOLUTION_EX7/provider.tf
@@ -3,11 +3,11 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.8.0"
     }
     cloudfoundry = {
-      source  = "sap/cloudfoundry"
-      version = "1.0.0-rc1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "~> 1.0.0"
     }
   }
 
diff --git a/released/dsag/betriebstag2024/modules/environment/cloudfoundry/envinstance_cf/README.md b/released/dsag/betriebstag2024/modules/environment/cloudfoundry/envinstance_cf/README.md
diff --git a/released/dsag/betriebstag2024/modules/environment/cloudfoundry/envinstance_cf/envinstance_cf.tf b/released/dsag/betriebstag2024/modules/environment/cloudfoundry/envinstance_cf/envinstance_cf.tf
@@ -7,7 +7,7 @@ terraform {
       source = "sap/btp"
     }
     cloudfoundry = {
-      source = "SAP/cloudfoundry"
+      source = "cloudfoundry/cloudfoundry"
     }
   }
 }
diff --git a/released/dsag/betriebstag2024/modules/environment/cloudfoundry/space_cf/space_cf.tf b/released/dsag/betriebstag2024/modules/environment/cloudfoundry/space_cf/space_cf.tf
@@ -4,7 +4,7 @@
 terraform {
   required_providers {
     cloudfoundry = {
-      source = "SAP/cloudfoundry"
+      source = "cloudfoundry/cloudfoundry"
     }
   }
 }
diff --git a/released/dsag/betriebstag2024/solution/provider.tf b/released/dsag/betriebstag2024/solution/provider.tf
@@ -2,11 +2,11 @@ terraform {
   required_providers {
     btp = {
       source  = "sap/btp"
-      version = "~> 1.5.0"
+      version = "~> 1.8.0"
     }
     cloudfoundry = {
-      source  = "sap/cloudfoundry"
-      version = "1.0.0-rc1"
+      source  = "cloudfoundry/cloudfoundry"
+      version = "~> 1.0.0"
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ terraform {`
`27`	`27`	`required_providers {`
`28`	`28`	`btp = {`
`29`	`29`	`source = "sap/btp"`
`30`		`- version = "~> 1.5.0"`
	`30`	`+ version = "~> 1.8.0"`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
`@@ -63,6 +63,6 @@ globalaccount = "<YOUR GLOBAL ACCOUNT SUBDOMAIN>"`
`63`	`63`
`64`	`64`	`## Summary`
`65`	`65`
`66`		`-You've now created a basic setup of the Terraform provider including its configuration.`
	`66`	`+You've now created a basic setup of the Terraform provider including its configuration.`
`67`	`67`
`68`	`68`	`Continue to - [Exercise 2 - Setup of a subaccount](../EXERCISE2/README.md).`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`btp = {`
`5`	`5`	`source = "sap/btp"`
`6`		`- version = "~> 1.5.0"`
	`6`	`+ version = "~> 1.8.0"`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`