Skip to content

Commit 56405b3

Browse files
author
James H. Nguyen
authored
chore: Fix failing lint test and updated README from docker_generate_docs target (#7)
1 parent 8fb3a41 commit 56405b3

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ Functional examples are included in the
2929
## Inputs
3030

3131
| Name | Description | Type | Default | Required |
32-
|------|-------------|:----:|:-----:|:-----:|
33-
| composer\_env\_name | Name of Cloud Composer Environment | string | n/a | yes |
34-
| composer\_sa | Service Account to be used for running Cloud Composer Environment. | string | n/a | yes |
35-
| project\_id | Project ID where Cloud Composer Environment is created. | string | n/a | yes |
36-
| region | Region where the Cloud Composer Environment is created. | string | n/a | yes |
32+
|------|-------------|------|---------|:--------:|
33+
| composer\_env\_name | Name of Cloud Composer Environment | `string` | n/a | yes |
34+
| composer\_sa | Service Account to be used for running Cloud Composer Environment. | `string` | n/a | yes |
35+
| project\_id | Project ID where Cloud Composer Environment is created. | `string` | n/a | yes |
36+
| region | Region where the Cloud Composer Environment is created. | `string` | n/a | yes |
3737

3838
## Outputs
3939

build/int.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ tags:
5050
- 'integration'
5151
substitutions:
5252
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
53-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
53+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'

build/lint.cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ tags:
2121
- 'lint'
2222
substitutions:
2323
_DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
24-
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
24+
_DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0'

examples/simple_composer_env/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ This example illustrates how to use the `composer` module.
66
## Inputs
77

88
| Name | Description | Type | Default | Required |
9-
|------|-------------|:----:|:-----:|:-----:|
10-
| composer\_env\_name | Name of Cloud Composer Environment. | string | n/a | yes |
11-
| composer\_service\_account | Service Account to be used for running Cloud Composer Environment. | string | n/a | yes |
12-
| project\_id | Project ID where Cloud Composer Environment is created. | string | n/a | yes |
13-
| region | Region where Cloud Composer Environment is created. | string | n/a | yes |
9+
|------|-------------|------|---------|:--------:|
10+
| composer\_env\_name | Name of Cloud Composer Environment. | `string` | n/a | yes |
11+
| composer\_service\_account | Service Account to be used for running Cloud Composer Environment. | `string` | n/a | yes |
12+
| project\_id | Project ID where Cloud Composer Environment is created. | `string` | n/a | yes |
13+
| region | Region where Cloud Composer Environment is created. | `string` | n/a | yes |
1414

1515
## Outputs
1616

modules/create_environment/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ module "composer" {
2929
## Inputs
3030

3131
| Name | Description | Type | Default | Required |
32-
|------|-------------|:----:|:-----:|:-----:|
33-
| composer\_env\_name | Name of Cloud Composer Environment | string | n/a | yes |
34-
| composer\_service\_account | Service Account for running Cloud Composer. | string | n/a | yes |
35-
| ip\_cidr\_range | CIDR range for the Cloud Composer Subnet. | string | `"10.0.0.0/14"` | no |
36-
| machine\_type | Machine type of Cloud Composer nodes. | string | `"n1-standard-8"` | no |
37-
| network\_name | Name of network created for Cloud Composer Environment. | string | `"composer-network-01"` | no |
38-
| node\_count | Number of worker nodes in Cloud Composer Environment. | number | `"3"` | no |
39-
| project\_id | Project ID where Cloud Composer Environment is created. | string | n/a | yes |
40-
| region | Region where the Cloud Composer Environment is created. | string | `"us-central1"` | no |
41-
| subnet\_name | Name of subnetwork created for Cloud Composer Environment. | string | `"composer-subnet-01"` | no |
42-
| zone | Zone where the Cloud Composer nodes are created. | string | `"us-central1-f"` | no |
32+
|------|-------------|------|---------|:--------:|
33+
| composer\_env\_name | Name of Cloud Composer Environment | `string` | n/a | yes |
34+
| composer\_service\_account | Service Account for running Cloud Composer. | `string` | n/a | yes |
35+
| ip\_cidr\_range | CIDR range for the Cloud Composer Subnet. | `string` | `"10.0.0.0/14"` | no |
36+
| machine\_type | Machine type of Cloud Composer nodes. | `string` | `"n1-standard-8"` | no |
37+
| network\_name | Name of network created for Cloud Composer Environment. | `string` | `"composer-network-01"` | no |
38+
| node\_count | Number of worker nodes in Cloud Composer Environment. | `number` | `3` | no |
39+
| project\_id | Project ID where Cloud Composer Environment is created. | `string` | n/a | yes |
40+
| region | Region where the Cloud Composer Environment is created. | `string` | `"us-central1"` | no |
41+
| subnet\_name | Name of subnetwork created for Cloud Composer Environment. | `string` | `"composer-subnet-01"` | no |
42+
| zone | Zone where the Cloud Composer nodes are created. | `string` | `"us-central1-f"` | no |
4343

4444
## Outputs
4545

test/setup/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
module "project" {
1818
source = "terraform-google-modules/project-factory/google"
19-
version = "~> 8.0"
19+
version = "~> 9.0"
2020

2121
name = "ci-composer"
2222
random_project_id = "true"

test/setup/versions.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.12"
18+
required_version = ">=0.12.6, <0.14"
1919
}
2020

2121
provider "google" {
22-
version = "~> 3.0"
22+
version = "~> 3.46.0"
2323
}
2424

2525
provider "google-beta" {
26-
version = "~> 3.0"
26+
version = "~> 3.46.0"
2727
}

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
*/
1616

1717
terraform {
18-
required_version = "~> 0.12.6"
18+
required_version = ">=0.12.6, <0.14"
1919
}

0 commit comments

Comments
 (0)