File tree Expand file tree Collapse file tree 5 files changed +49
-8
lines changed
modules/create_environment Expand file tree Collapse file tree 5 files changed +49
-8
lines changed Original file line number Diff line number Diff line change 1818# Make will use bash instead of sh
1919SHELL := /usr/bin/env bash
2020
21- DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0
21+ DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
2222DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424
Original file line number Diff line number Diff line change 1+ /* *
2+ * Copyright 2021 Google LLC
3+ *
4+ * Licensed under the Apache License, Version 2.0 (the "License");
5+ * you may not use this file except in compliance with the License.
6+ * You may obtain a copy of the License at
7+ *
8+ * http://www.apache.org/licenses/LICENSE-2.0
9+ *
10+ * Unless required by applicable law or agreed to in writing, software
11+ * distributed under the License is distributed on an "AS IS" BASIS,
12+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+ * See the License for the specific language governing permissions and
14+ * limitations under the License.
15+ */
16+
17+ terraform {
18+ required_version = " >= 0.13"
19+ required_providers {
20+
21+ google = {
22+ source = " hashicorp/google"
23+ version = " ~> 3.53"
24+ }
25+ }
26+
27+ provider_meta "google" {
28+ module_name = " blueprints/terraform/terraform-google-composer:create_environment/v1.0.0"
29+ }
30+
31+ }
Original file line number Diff line number Diff line change 1616
1717module "project" {
1818 source = " terraform-google-modules/project-factory/google"
19- version = " ~> 9 .0"
19+ version = " ~> 10 .0"
2020
2121 name = " ci-composer"
2222 random_project_id = " true"
2323 org_id = var. org_id
2424 folder_id = var. folder_id
2525 billing_account = var. billing_account
2626
27- skip_gcloud_download = true
28-
2927 activate_apis = [
3028 " cloudresourcemanager.googleapis.com" ,
3129 " storage-api.googleapis.com" ,
Original file line number Diff line number Diff line change @@ -19,9 +19,9 @@ terraform {
1919}
2020
2121provider "google" {
22- version = " ~> 3.46.0 "
22+ version = " ~> 3.53 "
2323}
2424
2525provider "google-beta" {
26- version = " ~> 3.46.0 "
26+ version = " ~> 3.53 "
2727}
Original file line number Diff line number Diff line change 11/* *
2- * Copyright 2020 Google LLC
2+ * Copyright 2021 Google LLC
33 *
44 * Licensed under the Apache License, Version 2.0 (the "License");
55 * you may not use this file except in compliance with the License.
1515 */
1616
1717terraform {
18- required_version = " >=0.12.6"
18+ required_version = " >= 0.13"
19+ required_providers {
20+
21+ google = {
22+ source = " hashicorp/google"
23+ version = " ~> 3.53"
24+ }
25+ }
26+
27+ provider_meta "google" {
28+ module_name = " blueprints/terraform/terraform-google-composer/v1.0.0"
29+ }
30+
1931}
You can’t perform that action at this time.
0 commit comments