Skip to content

Commit

Permalink
Merge branch 'main' into ks-ibm-catalog-lint
Browse files Browse the repository at this point in the history
  • Loading branch information
kierramarie authored Nov 11, 2024
2 parents bdf6425 + ee1ca8f commit 2ee356f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions common-go-assets/common-permanent-resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ hpcs_rg_south: "Default"
hpcs_south_root_key_crn: "crn:v1:bluemix:public:hs-crypto:us-south:a/abac0df06b644a9cabc6e44f55b3880e:e6dce284-e80f-46e1-a3c1-830f7adff7a9:key:76170fae-4e0c-48c3-8ebe-326059ebb533"
hpcs_south_root_key_id: "76170fae-4e0c-48c3-8ebe-326059ebb533"
hpcs_south_crn: "crn:v1:bluemix:public:hs-crypto:us-south:a/abac0df06b644a9cabc6e44f55b3880e:e6dce284-e80f-46e1-a3c1-830f7adff7a9::"
hpcs_south_private_endpoint: "https://api.private.us-south.hs-crypto.cloud.ibm.com:8992"
hpcs_south_public_endpoint: "https://api.us-south.hs-crypto.cloud.ibm.com:8992"
hpcs_south_private_endpoint: "https://e6dce284-e80f-46e1-a3c1-830f7adff7a9.api.private.us-south.hs-crypto.appdomain.cloud"
hpcs_south_public_endpoint: "https://e6dce284-e80f-46e1-a3c1-830f7adff7a9.api.us-south.hs-crypto.appdomain.cloud"

# vpc crn from GE staging account for transit gateway crossaccount connection tests
gestaging_vpc_crn: "crn:v1:bluemix:public:is:eu-gb:a/e185552d5fed42c68b77567836d13963::vpc:r018-2e2e57ed-07d1-4381-943d-08e3ddcd4ae4"
Expand Down
2 changes: 1 addition & 1 deletion examples/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE_VERSION=20.18.0
ARG NODE_VERSION=22.11.0

FROM node:${NODE_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion module-assets/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ repos:
hooks:
- id: hadolint
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.96.1
rev: v1.96.2
hooks:
- id: terraform_fmt
- id: terraform_validate
Expand Down
6 changes: 3 additions & 3 deletions module-assets/ci/install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ fi
# tflint
#######################################
# renovate: datasource=github-releases depName=terraform-linters/tflint
TFLINT_VERSION=v0.53.0
TFLINT_VERSION=v0.54.0
BINARY=tflint
set +e
INSTALLED_TFLINT_VERSION="$(tflint --version | grep "TFLint version " |cut -d' ' -f3)"
Expand Down Expand Up @@ -313,7 +313,7 @@ if [[ $OSTYPE == 'darwin'* ]]; then
fi

# renovate: datasource=github-releases depName=aquasecurity/trivy
TRIVY_VERSION=v0.56.2
TRIVY_VERSION=v0.57.0
BINARY=trivy
set +e
INSTALLED_TRIVY_VERSION="$(trivy version | grep "Version:" | cut -d' ' -f2)"
Expand Down Expand Up @@ -341,7 +341,7 @@ fi
#######################################

# renovate: datasource=github-releases depName=golangci/golangci-lint
GOLANGCI_LINT_VERSION=v1.61.0
GOLANGCI_LINT_VERSION=v1.62.0
BINARY=golangci-lint
set +e
INSTALLED_GOLANGCI_LINT_VERSION="$(golangci-lint --version | head -1 | cut -d' ' -f4)"
Expand Down
2 changes: 1 addition & 1 deletion stack-assets/stack-updater/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
requests==2.32.3
ibm-cloud-sdk-core==3.22.0
ibm-platform-services==0.58.0
ibm-platform-services==0.59.0
semver==3.0.2

0 comments on commit 2ee356f

Please sign in to comment.