Skip to content

Commit e7301f0

Browse files
jor2jor2
authored
Merge branch 'main' into update-tests
2 parents 5a9afc2 + 7c9ae86 commit e7301f0

File tree

6 files changed

+143
-940
lines changed

6 files changed

+143
-940
lines changed

‎chart/cloud-pak-deployer/templates/install-job.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
labels:
77
App: {{ .Values.deployer.prefix }}
88
annotations:
9+
# https://github.com/terraform-ibm-modules/terraform-ibm-cloudpak-data/issues/14
910
checkov.io/skip1: CKV_K8S_10
1011
checkov.io/skip2: CKV_K8S_11
1112
checkov.io/skip3: CKV_K8S_12
@@ -27,6 +28,7 @@ metadata:
2728
checkov.io/skip19: CKV_K8S_16
2829
checkov.io/skip20: CKV_K8S_8
2930
checkov.io/skip21: CKV_K8S_43
31+
checkov.io/skip22: CKV2_K8S_6
3032
spec:
3133
backoffLimit: 0
3234
completions: 1

‎chart/cloud-pak-deployer/templates/uninstall-job.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ metadata:
99
"helm.sh/hook": pre-delete
1010
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed
1111
"helm.sh/hook-weight": "4"
12+
# https://github.com/terraform-ibm-modules/terraform-ibm-cloudpak-data/issues/14
1213
checkov.io/skip1: CKV_K8S_21
1314
checkov.io/skip2: CKV_K8S_30
1415
checkov.io/skip3: CKV_K8S_28
@@ -29,6 +30,7 @@ metadata:
2930
checkov.io/skip18: CKV_K8S_12
3031
checkov.io/skip19: CKV_K8S_13
3132
checkov.io/skip20: CKV_K8S_14
33+
checkov.io/skip21: CKV2_K8S_6
3234
spec:
3335
parallelism: 1
3436
completions: 1

‎common-dev-assets‎

‎cra-config.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
#
77

88
version: "v1"
9-
CRA_TARGETS:
10-
- CRA_TARGET: "examples/basic" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
11-
CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json"
12-
PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile).
13-
# SCC_INSTANCE_ID: "" # The SCC instance ID to use to download profile for CRA scan. If not provided, a default global value will be used.
14-
# SCC_REGION: "" # The IBM Cloud region that the SCC instance is in. If not provided, a default global value will be used.
15-
CRA_ENVIRONMENT_VARIABLES: # An optional map of environment variables for CRA, where the key is the variable name and value is the value. Useful for providing TF_VARs.
16-
TF_VAR_prefix: "roks-cpd"
17-
TF_VAR_region: "au-syd"
9+
CRA_TARGETS: [] # disable CRA since no SCC instance exists in the test account
10+
# - CRA_TARGET: "examples/basic" # Target directory for CRA scan. If not provided, the CRA Scan will not be run.
11+
# CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json"
12+
# PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile).
13+
# # SCC_INSTANCE_ID: "" # The SCC instance ID to use to download profile for CRA scan. If not provided, a default global value will be used.
14+
# # SCC_REGION: "" # The IBM Cloud region that the SCC instance is in. If not provided, a default global value will be used.
15+
# CRA_ENVIRONMENT_VARIABLES: # An optional map of environment variables for CRA, where the key is the variable name and value is the value. Useful for providing TF_VARs.
16+
# TF_VAR_prefix: "roks-cpd"
17+
# TF_VAR_region: "au-syd"

‎tests/go.mod‎

Lines changed: 39 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,43 @@
11
module github.com/terraform-ibm-modules/terraform-ibm-cloudpak-data
22

3-
go 1.22.4
3+
go 1.23.0
44

5-
toolchain go1.23.4
5+
toolchain go1.24.2
66

77
require (
88
github.com/stretchr/testify v1.10.0
9-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.42.4
9+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.49.1
1010
)
1111

1212
require (
13-
cloud.google.com/go v0.110.4 // indirect
14-
cloud.google.com/go/compute v1.21.0 // indirect
15-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
16-
cloud.google.com/go/iam v1.1.1 // indirect
17-
cloud.google.com/go/storage v1.30.1 // indirect
1813
dario.cat/mergo v1.0.0 // indirect
1914
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
20-
github.com/IBM-Cloud/power-go-client v1.9.0 // indirect
15+
github.com/IBM-Cloud/power-go-client v1.11.0 // indirect
2116
github.com/IBM/cloud-databases-go-sdk v0.7.1 // indirect
22-
github.com/IBM/go-sdk-core/v5 v5.18.1 // indirect
23-
github.com/IBM/platform-services-go-sdk v0.72.0 // indirect
17+
github.com/IBM/go-sdk-core/v5 v5.19.1 // indirect
18+
github.com/IBM/platform-services-go-sdk v0.79.1 // indirect
2419
github.com/IBM/project-go-sdk v0.3.6 // indirect
2520
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
2621
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
27-
github.com/Microsoft/go-winio v0.6.1 // indirect
28-
github.com/ProtonMail/go-crypto v1.0.0 // indirect
22+
github.com/Microsoft/go-winio v0.6.2 // indirect
23+
github.com/ProtonMail/go-crypto v1.1.6 // indirect
2924
github.com/agext/levenshtein v1.2.3 // indirect
30-
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
3125
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
3226
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
33-
github.com/aws/aws-sdk-go v1.44.281 // indirect
3427
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
35-
github.com/cloudflare/circl v1.3.7 // indirect
36-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
28+
github.com/cloudflare/circl v1.6.1 // indirect
29+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
3730
github.com/davecgh/go-spew v1.1.1 // indirect
3831
github.com/emirpasic/gods v1.18.1 // indirect
39-
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
32+
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
4033
github.com/ghodss/yaml v1.0.0 // indirect
4134
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
42-
github.com/go-git/go-billy/v5 v5.5.0 // indirect
43-
github.com/go-git/go-git/v5 v5.12.0 // indirect
44-
github.com/go-logr/logr v1.3.0 // indirect
35+
github.com/go-git/go-billy/v5 v5.6.2 // indirect
36+
github.com/go-git/go-git/v5 v5.16.0 // indirect
37+
github.com/go-logr/logr v1.4.2 // indirect
4538
github.com/go-logr/stdr v1.2.2 // indirect
4639
github.com/go-openapi/analysis v0.21.5 // indirect
47-
github.com/go-openapi/errors v0.22.0 // indirect
40+
github.com/go-openapi/errors v0.22.1 // indirect
4841
github.com/go-openapi/jsonpointer v0.20.1 // indirect
4942
github.com/go-openapi/jsonreference v0.20.3 // indirect
5043
github.com/go-openapi/loads v0.21.3 // indirect
@@ -55,30 +48,25 @@ require (
5548
github.com/go-openapi/validate v0.22.4 // indirect
5649
github.com/go-playground/locales v0.14.1 // indirect
5750
github.com/go-playground/universal-translator v0.18.1 // indirect
58-
github.com/go-playground/validator/v10 v10.19.0 // indirect
59-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
60-
github.com/golang/protobuf v1.5.3 // indirect
61-
github.com/google/go-cmp v0.6.0 // indirect
62-
github.com/google/s2a-go v0.1.4 // indirect
51+
github.com/go-playground/validator/v10 v10.26.0 // indirect
52+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
53+
github.com/google/go-cmp v0.7.0 // indirect
6354
github.com/google/uuid v1.6.0 // indirect
64-
github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
65-
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
66-
github.com/gruntwork-io/terratest v0.47.2 // indirect
55+
github.com/gruntwork-io/terratest v0.48.2 // indirect
6756
github.com/hashicorp/errwrap v1.1.0 // indirect
6857
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
69-
github.com/hashicorp/go-getter v1.7.6 // indirect
58+
github.com/hashicorp/go-getter/v2 v2.2.3 // indirect
7059
github.com/hashicorp/go-multierror v1.1.1 // indirect
7160
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
7261
github.com/hashicorp/go-safetemp v1.0.0 // indirect
7362
github.com/hashicorp/go-version v1.7.0 // indirect
74-
github.com/hashicorp/hcl/v2 v2.17.0 // indirect
75-
github.com/hashicorp/terraform-json v0.23.0 // indirect
63+
github.com/hashicorp/hcl/v2 v2.22.0 // indirect
64+
github.com/hashicorp/terraform-json v0.24.0 // indirect
7665
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
7766
github.com/jinzhu/copier v0.4.0 // indirect
78-
github.com/jmespath/go-jmespath v0.4.0 // indirect
7967
github.com/josharian/intern v1.0.0 // indirect
8068
github.com/kevinburke/ssh_config v1.2.0 // indirect
81-
github.com/klauspost/compress v1.16.5 // indirect
69+
github.com/klauspost/compress v1.16.7 // indirect
8270
github.com/leodido/go-urn v1.4.0 // indirect
8371
github.com/mailru/easyjson v0.7.7 // indirect
8472
github.com/mattn/go-zglob v0.0.4 // indirect
@@ -88,36 +76,27 @@ require (
8876
github.com/mitchellh/mapstructure v1.5.0 // indirect
8977
github.com/oklog/ulid v1.3.1 // indirect
9078
github.com/opentracing/opentracing-go v1.2.0 // indirect
91-
github.com/pjbgf/sha1cd v0.3.0 // indirect
79+
github.com/pjbgf/sha1cd v0.3.2 // indirect
9280
github.com/pmezard/go-difflib v1.0.0 // indirect
9381
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
94-
github.com/skeema/knownhosts v1.2.2 // indirect
95-
github.com/tmccombs/hcl2json v0.5.0 // indirect
82+
github.com/skeema/knownhosts v1.3.1 // indirect
83+
github.com/tmccombs/hcl2json v0.6.4 // indirect
9684
github.com/ulikunitz/xz v0.5.11 // indirect
9785
github.com/xanzy/ssh-agent v0.3.3 // indirect
98-
github.com/zclconf/go-cty v1.15.0 // indirect
99-
go.mongodb.org/mongo-driver v1.14.0 // indirect
100-
go.opencensus.io v0.24.0 // indirect
101-
go.opentelemetry.io/otel v1.16.0 // indirect
102-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
103-
go.opentelemetry.io/otel/trace v1.16.0 // indirect
104-
golang.org/x/crypto v0.30.0 // indirect
105-
golang.org/x/mod v0.17.0 // indirect
106-
golang.org/x/net v0.30.0 // indirect
107-
golang.org/x/oauth2 v0.10.0 // indirect
108-
golang.org/x/sync v0.10.0 // indirect
109-
golang.org/x/sys v0.28.0 // indirect
110-
golang.org/x/text v0.21.0 // indirect
111-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
112-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
113-
google.golang.org/api v0.127.0 // indirect
114-
google.golang.org/appengine v1.6.7 // indirect
115-
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
116-
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
117-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
118-
google.golang.org/grpc v1.58.3 // indirect
119-
google.golang.org/protobuf v1.33.0 // indirect
86+
github.com/zclconf/go-cty v1.15.1 // indirect
87+
go.mongodb.org/mongo-driver v1.17.2 // indirect
88+
go.opentelemetry.io/otel v1.29.0 // indirect
89+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
90+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
91+
golang.org/x/crypto v0.37.0 // indirect
92+
golang.org/x/mod v0.18.0 // indirect
93+
golang.org/x/net v0.39.0 // indirect
94+
golang.org/x/sync v0.13.0 // indirect
95+
golang.org/x/sys v0.32.0 // indirect
96+
golang.org/x/text v0.24.0 // indirect
97+
golang.org/x/tools v0.22.0 // indirect
12098
gopkg.in/warnings.v0 v0.1.2 // indirect
12199
gopkg.in/yaml.v2 v2.4.0 // indirect
122100
gopkg.in/yaml.v3 v3.0.1 // indirect
101+
sigs.k8s.io/yaml v1.4.0 // indirect
123102
)

0 commit comments

Comments
 (0)