Merge branch 'master' into dependabot/go_modules/test/integration/gol…

…ang.org/x/net-0.23.0

CODEOWNERS

@@ -1,7 +1,7 @@
 # NOTE: This file is automatically generated from values at:
 # https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit/blob/master/infra/terraform/test-org/org/locals.tf
 
-* @terraform-google-modules/cft-admins
+* @terraform-google-modules/cft-admins @sjswerdlow @megelatim
 
 # NOTE: GitHub CODEOWNERS locations:
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-and-branch-protection

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.20
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.21
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

README.md

@@ -6,6 +6,10 @@ Below is the list of available submodules:
 - [SAP HANA](./modules/sap_hana/README.md)
 - [SAP HANA HA](./modules/sap_hana_ha/README.md)
 - [SAP HANA Scaleout](./modules/sap_hana_scaleout/README.md)
+- [SAP NW](./modules/sap_nw/README.md)
+- [SAP NW HA](./modules/sap_nw_ha/README.md)
+- [SAP S4](./modules/s4/README.md)
+- [SAP S4 HA](./modules/s4_ha/README.md)
 
 ## Usage
 

build/int.cloudbuild.yaml

@@ -63,4 +63,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.20'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.21'

build/lint.cloudbuild.yaml

@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.20'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.21'

examples/sap_nw_ha_simple/README.md

@@ -0,0 +1,25 @@
+# SAP NW HA example
+
+This example illustrates how to use the latest release of the terraform module for SAP on Google Cloud for provisioning SAP NetWeaver High-availability.
+
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|------|---------|:--------:|
+| project\_id | Project id where the instances will be created. | `string` | n/a | yes |
+
+## Outputs
+
+| Name | Description |
+|------|-------------|
+| sap\_nw\_ers\_worker\_self\_links | SAP NW ERS self-links for the instance created |
+| sap\_nw\_scs\_primary\_self\_link | SAP NW SCS self-link for the instance created |
+
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+
+To provision this example, run the following from within this directory:
+- `terraform init` to get the plugins
+- `terraform plan` to see the infrastructure plan
+- `terraform apply` to apply the infrastructure build
+- `terraform destroy` to destroy the built infrastructure

examples/sap_nw_ha_simple/main.tf

@@ -0,0 +1,49 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module "sap_nw_ha" {
+  source  = "terraform-google-modules/sap/google//modules/sap_nw_ha"
+  version = "~> 1.0"
+
+  project_id              = var.project_id
+  machine_type            = "n1-standard-16"
+  network                 = "default"
+  subnetwork              = "default"
+  linux_image             = "rhel-8-4-sap-ha"
+  linux_image_project     = "rhel-sap-cloud"
+  sap_primary_instance    = "hana-instance"
+  sap_secondary_instance  = "hana-instance"
+  sap_primary_zone        = "us-east1-b"
+  sap_secondary_zone      = "us-east1-c"
+  sap_sid                 = "XYZ"
+  nfs_path                = "${google_filestore_instance.example.networks[0].ip_addresses[0]}:/${google_filestore_instance.example.file_shares[0].name}"
+}
+
+resource "google_filestore_instance" "example" {
+  name     = "example-instance"
+  location = "us-central1-b"
+  tier     = "BASIC_HDD"
+
+  file_shares {
+    capacity_gb = 1024
+    name        = "share1"
+  }
+
+  networks {
+    network = "default"
+    modes   = ["MODE_IPV4"]
+  }
+}

examples/sap_nw_ha_simple/outputs.tf

@@ -0,0 +1,24 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+output "sap_nw_scs_primary_self_link" {
+  description = "SAP NW SCS self-link for the instance created"
+  value       = module.sap_nw_ha.scs_instance
+}
+
+output "sap_nw_ers_worker_self_links" {
+  description = "SAP NW ERS self-links for the instance created"
+  value       = module.sap_nw_ha.ers_instance
+}

examples/sap_nw_ha_simple/variables.tf

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+variable "project_id" {
+  type        = string
+  description = "Project id where the instances will be created."
+}

examples/sap_nw_simple/README.md

@@ -0,0 +1,24 @@
+# SAP Netweaver example
+
+This example illustrates how to use the latest release of the terraform module for SAP on Google Cloud for provisioning SAP NW
+
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|------|---------|:--------:|
+| project\_id | Project id where the instances will be created. | `string` | n/a | yes |
+
+## Outputs
+
+| Name | Description |
+|------|-------------|
+| sap\_nw\_primary\_self\_link | SAP NW self-link for the instance created |
+
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+
+To provision this example, run the following from within this directory:
+- `terraform init` to get the plugins
+- `terraform plan` to see the infrastructure plan
+- `terraform apply` to apply the infrastructure build
+- `terraform destroy` to destroy the built infrastructure

examples/sap_nw_simple/main.tf

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module "sap_nw" {
+  source  = "terraform-google-modules/sap/google//modules/sap_nw"
+  version = "~> 1.0"
+
+  project_id          = var.project_id
+  machine_type        = "n1-standard-16"
+  subnetwork          = "default"
+  linux_image         = "rhel-8-4-sap-ha"
+  linux_image_project = "rhel-sap-cloud"
+  instance_name       = "nwvm"
+  zone                = "us-east1-b"
+}

examples/sap_nw_simple/outputs.tf

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+output "sap_nw_primary_self_link" {
+  description = "SAP NW self-link for the instance created"
+  value       = module.sap_nw.sap_nw_self_link
+}

examples/sap_nw_simple/variables.tf

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+variable "project_id" {
+  type        = string
+  description = "Project id where the instances will be created."
+}

examples/sap_s4_ha_simple/README.md

@@ -0,0 +1,22 @@
+# SAP S4 HANA HA example
+
+This example illustrates how to use the latest release of the terraform module for SAP on Google Cloud for provisioning SAP S4 HANA HA
+
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|------|---------|:--------:|
+| project\_id | Project id where the instances will be created | `string` | n/a | yes |
+
+## Outputs
+
+No outputs.
+
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+
+To provision this example, run the following from within this directory:
+- `terraform init` to get the plugins
+- `terraform plan` to see the infrastructure plan
+- `terraform apply` to apply the infrastructure build
+- `terraform destroy` to destroy the built infrastructure

examples/sap_s4_ha_simple/main.tf

@@ -0,0 +1,29 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module "sap_s4_ha" {
+  source  = "terraform-google-modules/sap/google//modules/s4_ha"
+  version = "~> 1.0"
+
+  deployment_name     = "my_s4_ha"
+  gcp_project_id      = var.project_id
+  filestore_location  = "us-east1-b"
+  region_name         = "us-east1"
+  media_bucket_name   = "private-bucket"
+  zone1_name          = "us-east1-b"
+  zone2_name          = "us-east1-c"
+}
+

examples/sap_s4_ha_simple/variables.tf

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+variable "project_id" {
+  type        = string
+  description = "Project id where the instances will be created"
+}

examples/sap_s4_simple/README.md

@@ -0,0 +1,22 @@
+# SAP S4 HANA example
+
+This example illustrates how to use the latest release of the terraform module for SAP on Google Cloud for provisioning SAP S4 HANA
+
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+## Inputs
+
+| Name | Description | Type | Default | Required |
+|------|-------------|------|---------|:--------:|
+| project\_id | Project id where the instances will be created | `string` | n/a | yes |
+
+## Outputs
+
+No outputs.
+
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+
+To provision this example, run the following from within this directory:
+- `terraform init` to get the plugins
+- `terraform plan` to see the infrastructure plan
+- `terraform apply` to apply the infrastructure build
+- `terraform destroy` to destroy the built infrastructure

examples/sap_s4_simple/main.tf

@@ -0,0 +1,27 @@
+/**
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+module "sap_s4" {
+  source  = "terraform-google-modules/sap/google//modules/s4"
+  version = "~> 1.0"
+
+  deployment_name     = "my_s4"
+  gcp_project_id      = var.project_id
+  filestore_location  = "us-east1-b"
+  region_name         = "us-east1"
+  media_bucket_name   = "private-bucket"
+  zone1_name          = "us-east1-b"
+}