Skip to content

Commit 31c811d

Browse files
CerebrovinnyCerebrovinny
authored
Temporarily Disable/comment OCI Tests (#1097)
* fix: disable more oci tests (cherry picked from commit 19b252b) * fix: disable more oci tests (cherry picked from commit 31e9b74) * disable vendor (cherry picked from commit 0cf853b)
1 parent 141c731 commit 31c811d

File tree

6 files changed

+62
-56
lines changed

6 files changed

+62
-56
lines changed

‎tests/fixtures/scenarios/complete/components/terraform/infra/vpc2/component.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ spec:
1515
# In 'uri', Golang templates are supported https://pkg.go.dev/text/template
1616
# If 'version' is provided, '{{.Version}}' will be replaced with the 'version' value before pulling the files from 'uri'
1717
# Download the component from the AWS public ECR registry (https://docs.aws.amazon.com/AmazonECR/latest/public/public-registries.html)
18-
uri: "oci://public.ecr.aws/cloudposse/components/terraform/stable/aws/vpc:{{.Version}}"
18+
# TODO: Fix OCI test repository then re-enable this vendoring configuration
19+
# uri: "oci://public.ecr.aws/cloudposse/components/terraform/stable/aws/vpc:{{.Version}}"
1920
version: "latest"
2021
# Only include the files that match the 'included_paths' patterns
2122
# If 'included_paths' is not specified, all files will be matched except those that match the patterns from 'excluded_paths'

‎tests/fixtures/scenarios/complete/vendor.yaml‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,27 @@ spec:
2424
# In 'source', Golang templates are supported https://pkg.go.dev/text/template.
2525
# If 'version' is provided, '{{.Version}}' will be replaced with the 'version' value before pulling the files from 'source'.
2626
# Download the component from the AWS public ECR registry (https://docs.aws.amazon.com/AmazonECR/latest/public/public-registries.html).
27-
- component: "vpc"
28-
source: "oci://public.ecr.aws/cloudposse/components/terraform/stable/aws/vpc:{{.Version}}"
29-
version: "latest"
30-
targets:
31-
- "components/terraform/infra/vpc3"
32-
# Only include the files that match the 'included_paths' patterns.
33-
# If 'included_paths' is not specified, all files will be matched except those that match the patterns from 'excluded_paths'.
34-
# 'included_paths' support POSIX-style Globs for file names/paths (double-star `**` is supported).
35-
# https://en.wikipedia.org/wiki/Glob_(programming)
36-
# https://github.com/bmatcuk/doublestar#patterns
37-
included_paths:
38-
- "**/*.tf"
39-
- "**/*.tfvars"
40-
- "**/*.md"
41-
# Tags can be used to vendor component that have the specific tags
42-
# `atmos vendor pull --tags test`
43-
# Refer to https://atmos.tools/cli/commands/vendor/pull
44-
tags:
45-
- test
46-
- networking
27+
# TODO: Fix OCI test repository then re-enable this vendoring configuration
28+
# - component: "vpc"
29+
# source: "oci://public.ecr.aws/cloudposse/components/terraform/stable/aws/vpc:{{.Version}}"
30+
# version: "latest"
31+
# targets:
32+
# - "components/terraform/infra/vpc3"
33+
# # Only include the files that match the 'included_paths' patterns.
34+
# # If 'included_paths' is not specified, all files will be matched except those that match the patterns from 'excluded_paths'.
35+
# # 'included_paths' support POSIX-style Globs for file names/paths (double-star `**` is supported).
36+
# # https://en.wikipedia.org/wiki/Glob_(programming)
37+
# # https://github.com/bmatcuk/doublestar#patterns
38+
# included_paths:
39+
# - "**/*.tf"
40+
# - "**/*.tfvars"
41+
# - "**/*.md"
42+
# # Tags can be used to vendor component that have the specific tags
43+
# # `atmos vendor pull --tags test`
44+
# # Refer to https://atmos.tools/cli/commands/vendor/pull
45+
# tags:
46+
# - test
47+
# - networking
4748
- component: "vpc-flow-logs-bucket"
4849
source: "git::https://github.com/cloudposse/terraform-aws-components.git//modules/vpc-flow-logs-bucket?ref={{.Version}}"
4950
version: "1.323.0"

‎tests/fixtures/scenarios/complete/vendor/vendor2.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ spec:
88
- "vendor/vendor4"
99

1010
sources:
11-
- component: "my-vpc1"
12-
source: "oci://public.ecr.aws/cloudposse/components/terraform/stable/aws/vpc:{{.Version}}"
13-
version: "latest"
14-
targets:
15-
- "components/terraform/infra/my-vpc1"
11+
# TODO: Fix OCI test repository then re-enable this vendoring configuration
12+
# - component: "my-vpc1"
13+
# source: "oci://public.ecr.aws/cloudposse/components/terraform/stable/aws/vpc:{{.Version}}"
14+
# version: "latest"
15+
# targets:
16+
# - "components/terraform/infra/my-vpc1"
1617
- component: "my-vpc2"
1718
source: "github.com/cloudposse/terraform-aws-components.git//modules/vpc?ref={{.Version}}"
1819
version: "1.372.0"

‎tests/fixtures/scenarios/editorconfig/vendor.yaml‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,27 @@ spec:
2424
# In 'source', Golang templates are supported https://pkg.go.dev/text/template.
2525
# If 'version' is provided, '{{.Version}}' will be replaced with the 'version' value before pulling the files from 'source'.
2626
# Download the component from the AWS public ECR registry (https://docs.aws.amazon.com/AmazonECR/latest/public/public-registries.html).
27-
- component: "vpc"
28-
source: "oci://public.ecr.aws/cloudposse/components/terraform/stable/aws/vpc:{{.Version}}"
29-
version: "latest"
30-
targets:
31-
- "components/terraform/infra/vpc3"
32-
# Only include the files that match the 'included_paths' patterns.
33-
# If 'included_paths' is not specified, all files will be matched except those that match the patterns from 'excluded_paths'.
34-
# 'included_paths' support POSIX-style Globs for file names/paths (double-star `**` is supported).
35-
# https://en.wikipedia.org/wiki/Glob_(programming)
36-
# https://github.com/bmatcuk/doublestar#patterns
37-
included_paths:
38-
- "**/*.tf"
39-
- "**/*.tfvars"
40-
- "**/*.md"
41-
# Tags can be used to vendor component that have the specific tags
42-
# `atmos vendor pull --tags test`
43-
# Refer to https://atmos.tools/cli/commands/vendor/pull
44-
tags:
45-
- test
46-
- networking
27+
# TODO: Fix OCI test repository then re-enable this vendoring configuration
28+
# - component: "vpc"
29+
# source: "oci://public.ecr.aws/cloudposse/components/terraform/stable/aws/vpc:{{.Version}}"
30+
# version: "latest"
31+
# targets:
32+
# - "components/terraform/infra/vpc3"
33+
# # Only include the files that match the 'included_paths' patterns.
34+
# # If 'included_paths' is not specified, all files will be matched except those that match the patterns from 'excluded_paths'.
35+
# # 'included_paths' support POSIX-style Globs for file names/paths (double-star `**` is supported).
36+
# # https://en.wikipedia.org/wiki/Glob_(programming)
37+
# # https://github.com/bmatcuk/doublestar#patterns
38+
# included_paths:
39+
# - "**/*.tf"
40+
# - "**/*.tfvars"
41+
# - "**/*.md"
42+
# # Tags can be used to vendor component that have the specific tags
43+
# # `atmos vendor pull --tags test`
44+
# # Refer to https://atmos.tools/cli/commands/vendor/pull
45+
# tags:
46+
# - test
47+
# - networking
4748
- component: "vpc-flow-logs-bucket"
4849
source: "github.com/cloudposse/terraform-aws-components.git//modules/vpc-flow-logs-bucket?ref={{.Version}}"
4950
version: "1.323.0"

‎tests/fixtures/scenarios/vendor/vendor.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ spec:
3636
- "components/terraform/{{ .Component }}/{{.Version}}"
3737
tags:
3838
- demo
39-
- component: "my-vpc1"
40-
source: "oci://public.ecr.aws/cloudposse/components/terraform/stable/aws/vpc:{{.Version}}"
41-
version: "latest"
42-
targets:
43-
- "components/terraform/infra/my-vpc1"
39+
# TODO: Fix OCI test repository then re-enable this vendoring configuration
40+
# - component: "my-vpc1"
41+
# source: "oci://public.ecr.aws/cloudposse/components/terraform/stable/aws/vpc:{{.Version}}"
42+
# version: "latest"
43+
# targets:
44+
# - "components/terraform/infra/my-vpc1"
4445
- component: "vpc-src"
4546
source: "../../../fixtures/components/terraform/myapp" # required for test URI contain path traversal
4647
targets:

‎tests/test-cases/demo-stacks.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,12 @@ tests:
164164
- "./components/terraform/github/stargazers/main/providers.tf"
165165
- "./components/terraform/github/stargazers/main/variables.tf"
166166
- "./components/terraform/github/stargazers/main/versions.tf"
167-
- "./components/terraform/infra/my-vpc1/main.tf"
168-
- "./components/terraform/infra/my-vpc1/outputs.tf"
169-
- "./components/terraform/infra/my-vpc1/providers.tf"
170-
- "./components/terraform/infra/my-vpc1/variables.tf"
171-
- "./components/terraform/infra/my-vpc1/versions.tf"
167+
# TODO: Fix OCI test repository then re-enable these my-vpc1 file checks
168+
# - "./components/terraform/infra/my-vpc1/main.tf"
169+
# - "./components/terraform/infra/my-vpc1/outputs.tf"
170+
# - "./components/terraform/infra/my-vpc1/providers.tf"
171+
# - "./components/terraform/infra/my-vpc1/variables.tf"
172+
# - "./components/terraform/infra/my-vpc1/versions.tf"
172173
- "./components/terraform/test-components/main/main.tf"
173174
- "./components/terraform/test-components/main/outputs.tf"
174175
- "./components/terraform/test-components/main/providers.tf"

0 commit comments

Comments
 (0)