Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions released/dsag/betriebstag2024/exercises/EXERCISE1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ terraform {
required_providers {
btp = {
source = "sap/btp"
version = "~> 1.5.0"
version = "~> 1.8.0"
}
}
}
Expand Down Expand Up @@ -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).
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
btp = {
source = "sap/btp"
version = "~> 1.5.0"
version = "~> 1.8.0"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
btp = {
source = "sap/btp"
version = "~> 1.5.0"
version = "~> 1.8.0"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
btp = {
source = "sap/btp"
version = "~> 1.5.0"
version = "~> 1.8.0"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
btp = {
source = "sap/btp"
version = "~> 1.5.0"
version = "~> 1.8.0"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ terraform {
required_providers {
btp = {
source = "sap/btp"
version = "~> 1.5.0"
version = "~> 1.8.0"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions released/dsag/betriebstag2024/exercises/EXERCISE7/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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).
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
source = "sap/btp"
}
cloudfoundry = {
source = "SAP/cloudfoundry"
source = "cloudfoundry/cloudfoundry"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
terraform {
required_providers {
cloudfoundry = {
source = "SAP/cloudfoundry"
source = "cloudfoundry/cloudfoundry"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions released/dsag/betriebstag2024/solution/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

Expand Down