From f580dd031e397ac9ecdfdc9e9f9c6956a261e24a Mon Sep 17 00:00:00 2001 From: Yashvi Jain <91940132+YashviJain01@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:38:12 +0530 Subject: [PATCH] LTS channel (#8714) * testCurl8 Signed-off-by: SahithiMy * testCurl8 Signed-off-by: SahithiMy * nginx pipeline fix Signed-off-by: SahithiMy * automate-cluster-ctl pipeline fix Signed-off-by: SahithiMy * removed pinned version Signed-off-by: SahithiMy * Rebasing Signed-off-by: SahithiMy * GOlang update to version 1.22.0 Signed-off-by: daveaugustus * golang v1.22.5 Signed-off-by: daveaugustus * Modified Go version in all the files Signed-off-by: daveaugustus * Pipeline check Signed-off-by: daveaugustus * Pipeline check Signed-off-by: daveaugustus * Pipeline check Signed-off-by: daveaugustus * Pipeline check Signed-off-by: daveaugustus * proto check Signed-off-by: daveaugustus * Compiled protobuf with upgraded Golang v1.22.5 Signed-off-by: daveaugustus * Downgraded packages Signed-off-by: daveaugustus * Protobuf compiles newly added messages and services Signed-off-by: daveaugustus * Modified go mod downgrading some dependency for authz errors Signed-off-by: daveaugustus * Added GOPROXY Signed-off-by: daveaugustus * GOPROXY Signed-off-by: daveaugustus * Downgraded linter Signed-off-by: daveaugustus * Go linter modification Signed-off-by: daveaugustus * Removed enable unused Signed-off-by: daveaugustus * Downgraded protoc-gen-validate Signed-off-by: daveaugustus * package update Signed-off-by: daveaugustus * Downgraded grpc gateway Signed-off-by: daveaugustus * Regenerated code Signed-off-by: daveaugustus * Added golangci Signed-off-by: daveaugustus * Pipeline fix (#8563) * removing unnecessary changes Signed-off-by: Durga Sarat Chandra Maddu * fixing cert error message Signed-off-by: Durga Sarat Chandra Maddu * updating the code Signed-off-by: Durga Sarat Chandra Maddu --------- Signed-off-by: Durga Sarat Chandra Maddu * Dave/pipeline fix (#8564) * downgraded packages Signed-off-by: daveaugustus * upgraded linter Signed-off-by: daveaugustus * downgraded elastic search package Signed-off-by: daveaugustus * downgraded elastic search package Signed-off-by: daveaugustus * increased timeout Signed-off-by: daveaugustus * Added timeout for channels Signed-off-by: daveaugustus * modified the test case Signed-off-by: daveaugustus * Added timeout for channels Signed-off-by: daveaugustus * Fixed pipeline closing issue ingest service Signed-off-by: daveaugustus * fixed testcases ingest service Signed-off-by: daveaugustus * Changes in for range Signed-off-by: daveaugustus * Changes in for range Signed-off-by: daveaugustus * Modified for loops Signed-off-by: daveaugustus * error corrections Signed-off-by: daveaugustus * reverted timeout Signed-off-by: daveaugustus --------- Signed-off-by: daveaugustus Co-authored-by: daveaugustus * Checking repo health Signed-off-by: Yashvi Jain * testing pipeline Signed-off-by: Yashvi Jain * testing by upgrading golag Signed-off-by: Yashvi Jain * testing by upgrading golag Signed-off-by: Yashvi Jain * commented license scout Signed-off-by: iamazzeez * build pipeline fix Signed-off-by: iamazzeez * nats version downgrade Signed-off-by: iamazzeez * nats server upgrade Signed-off-by: iamazzeez * reverted nates upgrade Signed-off-by: iamazzeez * Dave/verify private fix 2 (#8579) * Restored license control Signed-off-by: daveaugustus * Added go proxy Signed-off-by: daveaugustus * Updated mod Signed-off-by: daveaugustus * modified test case Signed-off-by: daveaugustus * Added error check for server instance Signed-off-by: daveaugustus * grpc Signed-off-by: daveaugustus * fixed mod Signed-off-by: daveaugustus --------- Signed-off-by: daveaugustus Co-authored-by: daveaugustus * added go.sum dependency Signed-off-by: daveaugustus * license scout fix Signed-off-by: iamazzeez * repo health fix Signed-off-by: iamazzeez * modified pacnic check Signed-off-by: daveaugustus * Update storage.go * undefined log Signed-off-by: daveaugustus * Test Signed-off-by: daveaugustus * Revised the test cases Signed-off-by: daveaugustus * all go upgrade latest fixes Signed-off-by: iamazzeez * Pipeline for LTS Channel and go_1_22.4 Signed-off-by: daveaugustus * Modification in go version Signed-off-by: daveaugustus * changed fallback to stable Signed-off-by: daveaugustus * Getting correct package for core ruby Signed-off-by: Yashvi Jain * Getting correct package for core ruby Signed-off-by: Yashvi Jain * studio common updated LTS Signed-off-by: daveaugustus * Updated git version Signed-off-by: daveaugustus * Commenting a environment variable to pick local builds Signed-off-by: Yashvi Jain * Testing if ignore local works Signed-off-by: Yashvi Jain * Testing if ignore local works Signed-off-by: Yashvi Jain * Checking if we can build platform tools by adding do_before function Signed-off-by: Yashvi Jain * Adding an extra space in scaffolding Signed-off-by: Yashvi Jain * gov1.22.4 to go1.22.5 Signed-off-by: daveaugustus * ccore-->core Signed-off-by: daveaugustus * Skipping compliance service build Signed-off-by: daveaugustus * Skipping es-gateway service build Signed-off-by: daveaugustus * Skipping components/automate-cs-oc-erchef service build Signed-off-by: daveaugustus * Skipping components/automate-cs-ocid service build Signed-off-by: daveaugustus * Skipping components/automate-cs-ocid service build Signed-off-by: daveaugustus * Adding components in skip Signed-off-by: Yashvi Jain * Adding components in skip Signed-off-by: Yashvi Jain * Skipping build Signed-off-by: daveaugustus * Adding components in skip Signed-off-by: Yashvi Jain * Adding components in skip Signed-off-by: Yashvi Jain * Skipping build Signed-off-by: daveaugustus * Skipping build Signed-off-by: daveaugustus * Skipping build Signed-off-by: daveaugustus * Adding build for hs opensearch Signed-off-by: Yashvi Jain * Adding build for hs opensearch Signed-off-by: Yashvi Jain * skpi components/automate-ha-pgleaderchk Signed-off-by: daveaugustus * skpi components/automate-opensearch Signed-off-by: daveaugustus * build pg gateway Signed-off-by: daveaugustus * - Uncommented opensearch * removed automate-backend-elasticsidecar Signed-off-by: Aishwarya Aishwarya * removed automate-backend-opensearch Signed-off-by: Aishwarya Aishwarya * removed automate-builder-api-proxy Signed-off-by: Aishwarya Aishwarya * removed automate-builder-api Signed-off-by: Aishwarya Aishwarya * automate-builder-memcached Signed-off-by: Aishwarya Aishwarya * adding space in automate-debug Signed-off-by: Aishwarya Aishwarya * removed automate-minio Signed-off-by: Aishwarya Aishwarya * space Signed-off-by: Aishwarya Aishwarya * removed automate-cs-ocid Signed-off-by: Aishwarya Aishwarya * removed automate-cs-nginx Signed-off-by: Aishwarya Aishwarya * removed automate-cs-oc-erchef Signed-off-by: Aishwarya Aishwarya * removed automate-es-gateway Signed-off-by: Aishwarya Aishwarya * removed compliance-service Signed-off-by: Aishwarya Aishwarya * adding all skipped components Signed-off-by: Aishwarya Aishwarya * build data-life-cycle Signed-off-by: swatign * build automate-load-balancer Signed-off-by: swatign * adding all the components which are missed from the build Signed-off-by: swatign * skipping automate-load-balancer Signed-off-by: swatign * skipping automate-postgresql Signed-off-by: swatign * skipping automate-prometheus Signed-off-by: swatign * skipping automate-backend-ctl Signed-off-by: swatign * skipping automate-backend-ctl Signed-off-by: swatign * skipping automate-cluster-ctl Signed-off-by: swatign * skipping automate-backend-deployment Signed-off-by: swatign * adding automate-ui to skip list Signed-off-by: swatign * triggering data-life-cycle again Signed-off-by: swatign * adding core/pcre2 in the automate-load-balancer Signed-off-by: swatign * adding core/pcre2 in the automate-load-balancer and removed from skip list Signed-off-by: swatign * updating openssl to 3.0.9 Signed-off-by: swatign * updating openssl to 3.0.9 and pcre2 in automate-es-gateway Signed-off-by: swatign * trigerring pipelines Signed-off-by: Aishwarya Aishwarya * pinning openssl version Signed-off-by: Aishwarya Aishwarya * removing pinned version and trigerring lcs Signed-off-by: Aishwarya Aishwarya * checking automate-es-gateway Signed-off-by: swatign * openssl 3.0.9 in automate-es-gateway Signed-off-by: swatign * updating go.mod Signed-off-by: Yashvi Jain * updating go.mod Signed-off-by: Yashvi Jain * updating go.mod Signed-off-by: Yashvi Jain * sync go.mod Signed-off-by: Yashvi Jain * Adding pinged versions Signed-off-by: Yashvi Jain * More packages from stable channel pinged Signed-off-by: Yashvi Jain * notification service from stable channel Signed-off-by: Yashvi Jain * Checking license scout Signed-off-by: Yashvi Jain * fixing verify main pipeline Signed-off-by: Sahiba3108 * Adding license scout changes Signed-off-by: Yashvi Jain * Adding certs and chcking builds Signed-off-by: Yashvi Jain * checking license scout Signed-off-by: Yashvi Jain * checking license scout Signed-off-by: Yashvi Jain * fixing verify main pipeline Signed-off-by: Sahiba3108 * SSL_CERT_FILE_ADDED Signed-off-by: Sahiba3108 * SSL_CERT_FILE_ADDED Signed-off-by: Sahiba3108 * Adding pipeline fixes Signed-off-by: Yashvi Jain * Checking pipeline VCS error Signed-off-by: Yashvi Jain * protobuf pipline Signed-off-by: Yashvi Jain * protobuf Signed-off-by: Yashvi Jain * Adding fix for repo health Signed-off-by: Yashvi Jain * Adding correct version of ruby Signed-off-by: Yashvi Jain * Correct protobuf and repo health Signed-off-by: Yashvi Jain * Adding git config for automate-gateway Signed-off-by: Yashvi Jain * Adding spellcheck older version Signed-off-by: Yashvi Jain * Adding spellcheck older version Signed-off-by: Yashvi Jain * Removing ssl cert line Signed-off-by: Yashvi Jain * exporting ssl cert file Signed-off-by: Sahiba3108 * fixing repo health Signed-off-by: Sahiba3108 * removing more from verify build Signed-off-by: Yashvi Jain * Changing ruby package to ruby3_1 Signed-off-by: Yashvi Jain * pinned versions Signed-off-by: Sahiba3108 * pinned versions for automate-backend-ctl Signed-off-by: Sahiba3108 * ping openssl in load balancer Signed-off-by: Yashvi Jain * Removing openssl 3 dependency Signed-off-by: Yashvi Jain * Removing more components from skip Signed-off-by: Yashvi Jain * Adding correct package of builder Signed-off-by: Yashvi Jain * Pining the postgres client version Signed-off-by: Yashvi Jain * adding ui build Signed-off-by: Yashvi Jain * Checking for stable package with curl in product integration tests Signed-off-by: Yashvi Jain * Adding build pipeline as well from LTS channel Signed-off-by: Yashvi Jain * Removing go mod changes Signed-off-by: Yashvi Jain * Changing the error code Signed-off-by: Yashvi Jain * Checking the builds Signed-off-by: Yashvi Jain * Adding fallback channel as lts Signed-off-by: Yashvi Jain * Removing skipping components Signed-off-by: Yashvi Jain * Adding knife ec backup and license audit from stable channel Signed-off-by: Yashvi Jain * correct node18 build Signed-off-by: Yashvi Jain * changing habitat channel to test channel Signed-off-by: Yashvi Jain * Adding infra server packages Signed-off-by: Yashvi Jain * Adding new packages Signed-off-by: Yashvi Jain * Fixing build for HA Signed-off-by: Yashvi Jain * Changing the packages Signed-off-by: Yashvi Jain * reseting files from main Signed-off-by: Yashvi Jain * resting more files from local Signed-off-by: Yashvi Jain * resting more files from local Signed-off-by: Yashvi Jain * Removing protobuff version Signed-off-by: Yashvi Jain * version of v1.pb.go Signed-off-by: Yashvi Jain * Correcting the pipeline Signed-off-by: Yashvi Jain * rep health fix Signed-off-by: Yashvi Jain * pipeline fix Signed-off-by: Yashvi Jain * Picking up go dependencies from main branch Signed-off-by: Yashvi Jain * Picking up go dependencies from main branch Signed-off-by: Yashvi Jain * Picking up go dependencies from main branch Signed-off-by: Yashvi Jain * Picking up go dependencies from main branch Signed-off-by: Yashvi Jain * Picking up go dependencies from main branch Signed-off-by: Yashvi Jain * Picking up go dependencies from main branch Signed-off-by: Yashvi Jain * Picking up go dependencies from main branch Signed-off-by: Yashvi Jain * Picking up go dependencies from main branch Signed-off-by: Yashvi Jain * Picking up go dependencies from main branch Signed-off-by: Yashvi Jain * Picking up go dependencies from main branch Signed-off-by: Yashvi Jain * update allignment Signed-off-by: Durga Sarat Chandra Maddu * Adding review comments changes which removes unwanted comments and folders Signed-off-by: Yashvi Jain --------- Signed-off-by: SahithiMy Signed-off-by: daveaugustus Signed-off-by: Durga Sarat Chandra Maddu Signed-off-by: Yashvi Jain Signed-off-by: iamazzeez Signed-off-by: Aishwarya Aishwarya Signed-off-by: swatign Signed-off-by: Sahiba3108 Signed-off-by: Yashvi Jain Co-authored-by: SahithiMy Co-authored-by: daveaugustus Co-authored-by: Durga Sarat Chandra Maddu <44021874+Dmaddu@users.noreply.github.com> Co-authored-by: Augusutus <36985548+daveaugustus@users.noreply.github.com> Co-authored-by: Yashvi Jain Co-authored-by: iamazzeez Co-authored-by: Aishwarya Aishwarya Co-authored-by: swatign Co-authored-by: Sahiba3108 Co-authored-by: dmaddu --- .expeditor/build.habitat.yml | 2 +- .expeditor/generate-automate-cli-docs.sh | 2 +- .expeditor/license_scout.sh | 2 +- .expeditor/verify.pipeline.yml | 9 +++-- .expeditor/verify_private.pipeline.yml | 2 +- .license_scout.yml | 32 ++++++++++++++++- .studio/common | 14 +++++--- .studio/compliance-service | 2 +- .studio/golang | 4 ++- .studio/protobuf | 5 +-- .studiorc | 5 +-- .../automate-backend-ctl/habitat/plan.sh | 21 +++++------ .../habitat/plan.sh | 3 +- .../habitat/plan.sh | 6 ++-- .../automate-backend-haproxy/habitat/plan.sh | 1 + .../habitat/plan.sh | 22 ++++++------ .../habitat/plan.sh | 8 +++-- .../habitat/plan.sh | 12 +++---- .../automate-builder-api/habitat/plan.sh | 6 ++-- .../habitat/plan.sh | 14 ++++---- .../automate-cluster-ctl/habitat/plan.sh | 35 ++++++++++--------- .../automate-cs-bookshelf/habitat/plan.sh | 5 +-- components/automate-cs-nginx/habitat/plan.sh | 12 +++++-- .../automate-cs-oc-bifrost/habitat/plan.sh | 5 +-- .../automate-cs-oc-erchef/habitat/plan.sh | 7 ++-- components/automate-cs-ocid/habitat/plan.sh | 5 +-- components/automate-debug/habitat/plan.sh | 1 + .../automate-deployment/habitat/plan.sh | 24 ++++++------- components/automate-dex/habitat/plan.sh | 2 +- .../automate-es-gateway/habitat/plan.sh | 6 ++-- .../automate-ha-pgleaderchk/habitat/plan.sh | 5 +++ .../automate-knife-ec-backup/habitat/plan.sh | 5 +-- .../automate-load-balancer/habitat/plan.sh | 8 +++-- components/automate-netcat/habitat/plan.sh | 1 + components/automate-openjdk/habitat/plan.sh | 21 ++++++----- .../automate-opensearch/habitat/plan.sh | 15 ++++---- .../automate-pg-gateway/habitat/plan.sh | 11 +++--- .../automate-platform-tools/habitat/plan.sh | 5 +++ .../automate-postgresql/habitat/plan.sh | 5 +-- .../automate-prometheus/habitat/plan.sh | 1 + .../automate-scaffolding-go/habitat/plan.sh | 4 +-- .../automate-scaffolding/habitat/plan.sh | 1 + .../automate-ui-devproxy/habitat/plan.sh | 1 + components/automate-ui/habitat/plan.sh | 21 ++++++----- .../automate-workflow-web/habitat/plan.sh | 1 + components/backup-gateway/habitat/plan.sh | 2 +- components/compliance-service/habitat/plan.sh | 14 ++++---- .../data-lifecycle-service/habitat/plan.sh | 2 ++ .../license-control-service/habitat/plan.sh | 3 +- components/local-user-service/habitat/plan.sh | 4 +++ .../notifications-service/habitat/plan.sh | 21 ++++++----- .../notifications-service2/habitat/plan.sh | 1 + .../trial-license-service/habitat/plan.sh | 5 +++ integration/helpers/cert_auth_tests.sh | 4 +-- integration/helpers/setup.sh | 8 +++-- integration/helpers/testing.sh | 8 ++++- scripts/install_golang.sh | 2 +- scripts/repo_health.sh | 7 ++-- scripts/verify_build.sh | 9 +++-- 59 files changed, 291 insertions(+), 178 deletions(-) diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml index b3dc0c6d712..562a4f86a4c 100644 --- a/.expeditor/build.habitat.yml +++ b/.expeditor/build.habitat.yml @@ -20,6 +20,6 @@ studio_secrets: path: secret/a2/a2ha/opensearch field: node1-key.pem HAB_FALLBACK_CHANNEL: - value: "stable" + value: "LTS-2024" GOPROXY: value: "https://proxy.golang.org,direct" diff --git a/.expeditor/generate-automate-cli-docs.sh b/.expeditor/generate-automate-cli-docs.sh index de4c548fe00..03b77ea22c1 100755 --- a/.expeditor/generate-automate-cli-docs.sh +++ b/.expeditor/generate-automate-cli-docs.sh @@ -2,7 +2,7 @@ set -eou pipefail # bumping expeditor to go 1.22 -hab pkg install --binlink core/go22 --force +hab pkg install --binlink core/go1_22 --channel LTS-2024 --force pushd components/automate-cli make docs diff --git a/.expeditor/license_scout.sh b/.expeditor/license_scout.sh index 804cf9ddc5f..a9027b79e3a 100755 --- a/.expeditor/license_scout.sh +++ b/.expeditor/license_scout.sh @@ -43,7 +43,7 @@ gem install license_scout -v 2.5.1 log "Finished Installing License Scout" log_section_start "Installing Go 1.22.5" -hab pkg install --force --binlink core/go22/1.22.5 && rm -rf /hab/cache && mkdir -p "$GOPATH/src" "$GOPATH/bin" +hab pkg install --force --binlink core/go1_22/1.22.5 && rm -rf /hab/cache && mkdir -p "$GOPATH/src" "$GOPATH/bin" go version log "Finished Installing Go 1.22.5" diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index eb10328b937..7f1a023902c 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -1,11 +1,12 @@ env: DOCKER_CONFIG: /var/lib/buildkite-agent/.docker - HAB_BLDR_CHANNEL: "stable" + HAB_BLDR_CHANNEL: "LTS-2024" HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "stable" # Use the Go module mirror and checksum database by default. # See https://proxy.golang.org for details. GOPROXY: "https://proxy.golang.org,direct" GOSUMDB: "sum.golang.org" + PGGSSENCMODE: "disable" expeditor: defaults: @@ -165,7 +166,7 @@ steps: - rm -rf /bin/zdump - rm -rf /bin/sprof - scripts/install_hab_pkg.sh core/glibc # opa depends implicitly glibc - - scripts/install_hab_pkg.sh core/opa + - scripts/install_hab_pkg.sh core/opa/0.34.2/20240106123544 - cd components/authz-service/engine/opa/policy - make static unit timeout_in_minutes: 10 @@ -301,7 +302,7 @@ steps: privileged: true - label: "[unit] automate-gateway" - command: + command: - hab studio run "source .studiorc && go_component_unit automate-gateway" - cd components/automate-gateway - make lint fmt @@ -420,6 +421,7 @@ steps: - label: "[unit] event-feed-service" command: + - git config --global --add safe.directory /go/src/github.com/chef/automate - hab studio run "source .studiorc && go_component_unit event-feed-service && go_component_static_tests event-feed-service && go_component_lint event-feed-service" timeout_in_minutes: 10 retry: @@ -435,6 +437,7 @@ steps: - label: "[unit] ingest-service" command: + - git config --global --add safe.directory /go/src/github.com/chef/automate - hab studio run "source .studiorc && go_component_unit ingest-service && go_component_static_tests ingest-service && go_component_lint ingest-service" timeout_in_minutes: 10 retry: diff --git a/.expeditor/verify_private.pipeline.yml b/.expeditor/verify_private.pipeline.yml index 6c5dd88949a..ac2486284c8 100644 --- a/.expeditor/verify_private.pipeline.yml +++ b/.expeditor/verify_private.pipeline.yml @@ -4,7 +4,7 @@ env: DOCKER_CONFIG: /var/lib/buildkite-agent/.docker - HAB_BLDR_CHANNEL: "stable" + HAB_BLDR_CHANNEL: "LTS-2024" #HAB_STUDIO_SECRET_HAB_BLDR_CHANNEL: "curl8" #HAB_FALLBACK_CHANNEL: "stable" HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "stable" diff --git a/.license_scout.yml b/.license_scout.yml index 9f61bda6738..1d1a1e48c37 100644 --- a/.license_scout.yml +++ b/.license_scout.yml @@ -60,7 +60,7 @@ habitat: - origin: chef channel: dev - origin: core - channel: stable + channel: LTS-2024 allowed_licenses: - 0BSD - Apache-1.0 @@ -1631,6 +1631,36 @@ exceptions: reason: Ruby license (previously shipped in Automate 1) - name: core/ruby27 reason: Exception made for chef server upgrade + - name: core/acl + reason: Exception made by Chef Legal + - name: core/diffutils + reason: Exception made by Chef Legal + - name: core/file + reason: Exception made by Chef Legal + - name: core/libxau + reason: Exception made by Chef Legal + - name: core/libxcb + reason: Exception made by Chef Legal + - name: core/libxdmcp + reason: Exception made by Chef Legal + - name: core/libxi + reason: Exception made by Chef Legal + - name: core/libxrender + reason: Exception made by Chef Legal + - name: core/libxtst + reason: Exception made by Chef Legal + - name: core/lzo + reason: Exception made by Chef Legal + - name: core/lzop + reason: Exception made by Chef Legal + - name: core/ncurses + reason: Exception made by Chef Legal + - name: core/sqlite + reason: Exception made by Chef Legal + - name: core/ruby3_1 + reason: Ruby license (previously shipped in Automate 1) + - name : core/libmpc + reason: Exception made by Chef Legal ruby: - name: highline diff --git a/.studio/common b/.studio/common index 6c2d231e2ef..6bf193cdb94 100644 --- a/.studio/common +++ b/.studio/common @@ -63,7 +63,9 @@ document "verify_products_generation" </dev/null diff --git a/.studio/compliance-service b/.studio/compliance-service index f07d0888186..b770155cf2f 100644 --- a/.studio/compliance-service +++ b/.studio/compliance-service @@ -146,7 +146,7 @@ function load_scan_jobs() { # shellcheck disable=SC1091 source dev/secrets-env.sh pushd dev-docs/adding-data &> /dev/null - iinstall_if_missing core/go22 go + iinstall_if_missing core/go1_22/1.22.5 go go run add_scanjobs.go popd &> /dev/null fi diff --git a/.studio/golang b/.studio/golang index 047033abf37..42f92f621bb 100644 --- a/.studio/golang +++ b/.studio/golang @@ -32,6 +32,8 @@ DOC function go_component_unit() { install_go + GOFLAGS=-buildvcs=false + VERBOSE_TESTS= if [[ "$1" == "-v" ]]; then VERBOSE_TESTS=$1 @@ -271,7 +273,7 @@ function go_component_lint() { [ "x$1" == "x" ] && error "Missing component name argument; try 'describe ${FUNCNAME[0]}'" && return 1 verify_component $1 || return $? local component=$1 - install_golangci && run_golangci components/$component/... + export GOFLAGS=-buildvcs=false && install_golangci && run_golangci components/$component/... } complete -F _component_auto_complete go_component_lint diff --git a/.studio/protobuf b/.studio/protobuf index 5ecf9e2f913..22516a17081 100644 --- a/.studio/protobuf +++ b/.studio/protobuf @@ -21,7 +21,7 @@ document "install_protoc_toolchain" <= 1.13 will assume this but we have tools like protoc extensions that # look for it. export GO111MODULE=on diff --git a/components/automate-backend-ctl/habitat/plan.sh b/components/automate-backend-ctl/habitat/plan.sh index 0be054dcb2e..3882c3f1389 100644 --- a/components/automate-backend-ctl/habitat/plan.sh +++ b/components/automate-backend-ctl/habitat/plan.sh @@ -13,19 +13,19 @@ do_before() { } pkg_deps=( - core/ruby31 - core/libffi - chef/mlsa - core/bash - core/coreutils - core/glibc - core/postgresql-client + core/ruby31/3.1.6/20240912144513 + core/libffi/3.4.2/20240105233930 + chef/mlsa/1.0.1/20240125084021 + core/bash/5.1/20240105214248 + core/coreutils/8.32/20240105213308 + core/glibc/2.35/20240105171810 + core/postgresql-client/9.6.24/20240106122111 ) pkg_build_deps=( - core/make - core/gcc - core/rsync + core/make/4.3/20240105222044 + core/gcc/9.5.0/20240105175314 + core/rsync/3.2.3/20240107034222 ) pkg_bin_dirs=(bin) @@ -101,3 +101,4 @@ EOF chmod -v 755 "$bin" } + diff --git a/components/automate-backend-deployment/habitat/plan.sh b/components/automate-backend-deployment/habitat/plan.sh index b1e6abd1baa..233afe09847 100644 --- a/components/automate-backend-deployment/habitat/plan.sh +++ b/components/automate-backend-deployment/habitat/plan.sh @@ -31,7 +31,7 @@ pkg_deps=( # core/python ( core/python/3.10.0/20231020105702 core/python/3.10.0/20220817121853 ) # pkg_build_deps=( - core/gcc + core/gcc/9.5.0/20240105175314 ) # workaround for https://github.com/habitat-sh/habitat/issues/6341 @@ -129,3 +129,4 @@ do_strip() { + diff --git a/components/automate-backend-elasticsidecar/habitat/plan.sh b/components/automate-backend-elasticsidecar/habitat/plan.sh index 4d4d62db9f0..e3bc04b5c98 100644 --- a/components/automate-backend-elasticsidecar/habitat/plan.sh +++ b/components/automate-backend-elasticsidecar/habitat/plan.sh @@ -11,13 +11,13 @@ pkg_license=("Chef-MLSA") pkg_version="0.1.0" pkg_upstream_url="http://github.com/chef/automate/components/automate-backend-elasticsidecar" pkg_deps=( - core/bash + core/bash/5.1/20240105214248 chef/automate-openjdk chef/automate-ha-opensearch ) pkg_build_deps=( - core/make - core/gcc + core/make/4.3/20240105222044 + core/gcc/9.5.0/20240105175314 ) pkg_binds=( diff --git a/components/automate-backend-haproxy/habitat/plan.sh b/components/automate-backend-haproxy/habitat/plan.sh index a88accf4b35..a0b71256ea8 100644 --- a/components/automate-backend-haproxy/habitat/plan.sh +++ b/components/automate-backend-haproxy/habitat/plan.sh @@ -47,3 +47,4 @@ do_install() { return 0 } + diff --git a/components/automate-backend-opensearch/habitat/plan.sh b/components/automate-backend-opensearch/habitat/plan.sh index a319b1cefb4..faddbdd5abb 100644 --- a/components/automate-backend-opensearch/habitat/plan.sh +++ b/components/automate-backend-opensearch/habitat/plan.sh @@ -12,21 +12,21 @@ pkg_upstream_url="https://www.chef.io/automate" pkg_source="https://artifacts.opensearch.org/releases/bundle/opensearch/1.3.20/opensearch-1.3.20-linux-x64.tar.gz" pkg_shasum=a786fe52b4d25db85cc49f34df6118f19c434b25935f28bd98c0f874ae77ccc3 pkg_build_deps=( - core/patchelf - core/make - core/gcc + core/patchelf/0.13/20240105212025 + core/make/4.3/20240105222044 + core/gcc/9.5.0/20240105175314 ) pkg_deps=( - core/coreutils - core/glibc - core/zlib - core/bash # hooks - chef/mlsa - core/curl # health_check + core/coreutils/8.32/20240105213308 + core/glibc/2.35/20240105171810 + core/zlib/1.3/20240105173710 + core/bash/5.1/20240105214248 # hooks + chef/mlsa/1.0.1/20240125084021 + core/curl/8.7.1/20240614090648 #healthcheck chef/automate-openjdk - chef/automate-platform-tools - core/ruby31 + chef/automate-platform-tools/0.1.0/20241212061203 + core/ruby31/3.1.6/20240912144513 ) pkg_interpreters=(bin/ruby) pkg_bin_dirs=(os/bin) diff --git a/components/automate-backend-postgresql/habitat/plan.sh b/components/automate-backend-postgresql/habitat/plan.sh index ecab0376ebd..81d4dca86a9 100644 --- a/components/automate-backend-postgresql/habitat/plan.sh +++ b/components/automate-backend-postgresql/habitat/plan.sh @@ -2,7 +2,7 @@ # stable channel -UPSTREAM_PKG_IDENT="core/postgresql13/13.18" +UPSTREAM_PKG_IDENT="core/postgresql13/13.18/20241203070217" pkg_name="automate-ha-postgresql" pkg_description="Wrapper package for core/postgresql13" pkg_origin="chef" @@ -13,8 +13,8 @@ pkg_license=("Chef-MLSA") pkg_upstream_url="https://www.chef.io/automate" pkg_deps=( - chef/mlsa - core/bash + chef/mlsa/1.0.1/20240125084021 + core/bash/5.1/20240105214248 "${UPSTREAM_PKG_IDENT}" ) @@ -52,3 +52,5 @@ do_end() { return 0 } + + diff --git a/components/automate-builder-api-proxy/habitat/plan.sh b/components/automate-builder-api-proxy/habitat/plan.sh index cc59b5ae089..4fcd0e3b239 100644 --- a/components/automate-builder-api-proxy/habitat/plan.sh +++ b/components/automate-builder-api-proxy/habitat/plan.sh @@ -14,16 +14,16 @@ pkg_upstream_url="https://www.chef.io/automate" pkg_svc_user="root" pkg_deps=( - core/coreutils - core/bash - chef/mlsa - "${local_platform_tools_origin:-chef}/automate-platform-tools" + core/coreutils/8.32/20240105213308 + core/bash/5.1/20240105214248 + chef/mlsa/1.0.1/20240125084021 + chef/automate-platform-tools/0.1.0/20241212061203 # We need to pin here to get a build from unstable - habitat/builder-api-proxy + habitat/builder-api-proxy/9639/20240722052815 ) pkg_build_deps=( - core/gcc + core/gcc/9.5.0/20240105175314 ) pkg_binds=( diff --git a/components/automate-builder-api/habitat/plan.sh b/components/automate-builder-api/habitat/plan.sh index adf16f42d09..68d51101683 100644 --- a/components/automate-builder-api/habitat/plan.sh +++ b/components/automate-builder-api/habitat/plan.sh @@ -14,10 +14,10 @@ pkg_maintainer="Chef Software Inc. " pkg_license=("Chef-MLSA") pkg_upstream_url="https://www.chef.io/automate" pkg_deps=( - core/bash - "${local_platform_tools_origin:-chef}/automate-platform-tools" + core/bash/5.1/20240105214248 + chef/automate-platform-tools/0.1.0/20241212061203 # We need to pin here to get a build from unstable - habitat/builder-api + habitat/builder-api/10315/20240913162802 ) pkg_binds=( diff --git a/components/automate-builder-memcached/habitat/plan.sh b/components/automate-builder-memcached/habitat/plan.sh index 527ab666c40..ae7c30af42f 100644 --- a/components/automate-builder-memcached/habitat/plan.sh +++ b/components/automate-builder-memcached/habitat/plan.sh @@ -11,17 +11,17 @@ pkg_source="http://www.memcached.org/files/${pkg_distname}-${pkg_version}.tar.gz pkg_shasum=f291a35f82ef9756ed1d952879ef5f4be870f932bdfcb2ab61356609abf82346 pkg_deps=( - core/bash - core/glibc - core/libevent - core/openssl11 + core/bash/5.1/20240105214248 + core/glibc/2.35/20240105171810 + core/libevent/2.1.12/20240106023556 + core/openssl11/1.1.1w/20240106015742 ) pkg_build_deps=( - core/git - core/gcc - core/make + core/git/2.33.1/20240614092831 + core/gcc/9.5.0/20240105175314 + core/make/4.3/20240105222044 ) pkg_bin_dirs=(bin) pkg_include_dirs=(include) diff --git a/components/automate-cluster-ctl/habitat/plan.sh b/components/automate-cluster-ctl/habitat/plan.sh index 86a40375e15..eab2b06ec4e 100644 --- a/components/automate-cluster-ctl/habitat/plan.sh +++ b/components/automate-cluster-ctl/habitat/plan.sh @@ -9,23 +9,23 @@ pkg_maintainer="Chef Software Inc. " pkg_license=("Chef-MLSA") pkg_deps=( - core/ruby31 - core/aws-cli + core/ruby31/3.1.6/20240912144513 + core/aws-cli/1.31.4/20240106034739 # chef/inspec/4.56.61 - core/bash - core/coreutils - core/cacerts - core/findutils - core/gawk - core/gzip - core/jq-static - core/openssh - core/make - core/curl - core/terraform1 - core/hab/1.6.1205/20241107140309 - core/openssl/1.0.2zi - core/rsync + core/bash/5.1/20240105214248 + core/coreutils/8.32/20240105213308 + core/cacerts/2021.10.26/20240105224256 + core/findutils/4.9.0/20240105220908 + core/gawk/5.1.0/20240105214723 + core/gzip/1.13/20240105221940 + core/jq-static/1.6/20240107004905 + core/openssh/7.9p1/20240106022237 + core/make/4.3/20240105222044 + core/curl/8.7.1/20240614090648 + core/terraform1/1.5.7/20240106055300 + core/hab/1.6.1041/20240411141804 + core/openssl/1.0.2zi/20240105224424 + core/rsync/3.2.3/20240107034222 # core/openssh ( core/openssh/7.9p1/20220311132702 core/openssh/7.9p1/20230816095218 ) # core/openssl ( core/openssl/1.0.2zf/20230816063107 core/openssl/1.0.2zb/20220311111046 ) @@ -33,7 +33,7 @@ pkg_deps=( ) pkg_build_deps=( - core/gcc + core/gcc/9.5.0/20240105175314 ) pkg_bin_dirs=(bin) @@ -132,3 +132,4 @@ do_strip() { return 0 } + diff --git a/components/automate-cs-bookshelf/habitat/plan.sh b/components/automate-cs-bookshelf/habitat/plan.sh index 90f93f83cd5..e572e43d82a 100644 --- a/components/automate-cs-bookshelf/habitat/plan.sh +++ b/components/automate-cs-bookshelf/habitat/plan.sh @@ -14,8 +14,9 @@ pkg_maintainer="Chef Software Inc. " pkg_license=("Chef-MLSA") pkg_upstream_url="https://www.chef.io/automate" pkg_deps=( - chef/mlsa - "${local_platform_tools_origin:-chef}/automate-platform-tools" + chef/mlsa/1.0.1/20240125084021 + #"${local_platform_tools_origin:-chef}/automate-platform-tools" + chef/automate-platform-tools/0.1.0/20241212061203 # WARNING: Version pin managed by .expeditor/update_chef_server.sh "${vendor_origin}/bookshelf/15.10.27/20250102025130" ) diff --git a/components/automate-cs-nginx/habitat/plan.sh b/components/automate-cs-nginx/habitat/plan.sh index 542c0390d35..30d87e9fe2d 100644 --- a/components/automate-cs-nginx/habitat/plan.sh +++ b/components/automate-cs-nginx/habitat/plan.sh @@ -11,15 +11,15 @@ pkg_license=('Chef-MLSA') # WARNING: Version managed by .expeditor/update_chef_server.sh pkg_version="15.10.27" pkg_deps=( - core/coreutils - chef/mlsa + core/coreutils/8.32/20240105213308 + chef/mlsa/1.0.1/20240125084021 # TODO 2020-05-12: PIN PIN PIN # # All dependencies that are shared between this package and the # chef-server-* packages are pinned to the versions required by the # chef-server-* packages. # - core/curl + core/curl/8.7.1/20240614090648 core/ruby31/3.1.6/20240912144513 # WARNING: Version pin managed by .expeditor/update_chef_server.sh "${vendor_origin}/chef-server-nginx/15.10.27/20250102025712" @@ -86,3 +86,9 @@ do_install() { sed -i "s!__BUILDTIME_HAB_PKG_PATH_RUBY__!$(pkg_path_for core/ruby31)!g" "$wrapper_bin_path/knife" } + + +do_before() { + do_default_before + git config --global --add safe.directory /src +} \ No newline at end of file diff --git a/components/automate-cs-oc-bifrost/habitat/plan.sh b/components/automate-cs-oc-bifrost/habitat/plan.sh index ccbcf3c7e54..81127b979c2 100644 --- a/components/automate-cs-oc-bifrost/habitat/plan.sh +++ b/components/automate-cs-oc-bifrost/habitat/plan.sh @@ -14,8 +14,9 @@ pkg_maintainer="Chef Software Inc. " pkg_license=("Chef-MLSA") pkg_upstream_url="https://www.chef.io/automate" pkg_deps=( - chef/mlsa - "${local_platform_tools_origin:-chef}/automate-platform-tools" + chef/mlsa/1.0.1/20240125084021 + #"${local_platform_tools_origin:-chef}/automate-platform-tools" + chef/automate-platform-tools/0.1.0/20241212061203 # WARNING: Version pin managed by .expeditor/update_chef_server.sh "${vendor_origin}/oc_bifrost/15.10.27/20250102025130" ) diff --git a/components/automate-cs-oc-erchef/habitat/plan.sh b/components/automate-cs-oc-erchef/habitat/plan.sh index 0419a75d23a..7f7f5e82307 100644 --- a/components/automate-cs-oc-erchef/habitat/plan.sh +++ b/components/automate-cs-oc-erchef/habitat/plan.sh @@ -18,9 +18,10 @@ pkg_license=("Chef-MLSA") pkg_upstream_url="https://www.chef.io/automate" pkg_deps=( #core/runit/2.1.2/20200403133549 - core/runit - chef/mlsa - "${local_platform_tools_origin:-chef}/automate-platform-tools" + core/runit/2.1.2/20240106064032 + chef/mlsa/1.0.1/20240125084021 + #"${local_platform_tools_origin:-chef}/automate-platform-tools" + chef/automate-platform-tools/0.1.0/20241212061203 # WARNING: Version pin managed by .expeditor/update_chef_server.sh "${vendor_origin}/oc_erchef/15.10.27/20250102025130" ) diff --git a/components/automate-cs-ocid/habitat/plan.sh b/components/automate-cs-ocid/habitat/plan.sh index 10425d05ded..e38f9431b39 100644 --- a/components/automate-cs-ocid/habitat/plan.sh +++ b/components/automate-cs-ocid/habitat/plan.sh @@ -19,8 +19,9 @@ pkg_svc_run="return 0" pkg_upstream_url="https://www.chef.io/automate" pkg_deps=( - chef/mlsa - "${local_platform_tools_origin:-chef}/automate-platform-tools" + chef/mlsa/1.0.1/20240125084021 + #"${local_platform_tools_origin:-chef}/automate-platform-tools" + chef/automate-platform-tools/0.1.0/20241212061203 # WARNING: Version pin managed by .expeditor/update_chef_server.sh "${vendor_origin}/oc_id/15.10.27/20250102025130" ) diff --git a/components/automate-debug/habitat/plan.sh b/components/automate-debug/habitat/plan.sh index e6a4eef5b47..6a1cd1faa17 100644 --- a/components/automate-debug/habitat/plan.sh +++ b/components/automate-debug/habitat/plan.sh @@ -18,3 +18,4 @@ do_install() { return 0 } + diff --git a/components/automate-deployment/habitat/plan.sh b/components/automate-deployment/habitat/plan.sh index 475a679824b..65c90540efe 100644 --- a/components/automate-deployment/habitat/plan.sh +++ b/components/automate-deployment/habitat/plan.sh @@ -18,21 +18,21 @@ pkg_deps=( # # IF YOU UPDATE THIS PIN YOU MUST ALSO UPDATE .expeditor/create-manifest.rb core/hab/1.6.1205/20241107140309 - core/net-tools - core/procps-ng - core/util-linux + core/net-tools/1.60/20240107000437 + core/procps-ng/3.3.17/20240105213209 + core/util-linux/2.37/20240105222503 "${local_platform_tools_origin:-chef}/automate-platform-tools" - core/bash - core/cacerts # fetching manifest over HTTPS - core/certstrap - core/coreutils - core/findutils - core/rsync - core/tar - chef/mlsa + core/bash/5.1/20240105214248 + core/cacerts/2021.10.26/20240105224256 # fetching manifest over HTTPS + core/certstrap/v1.2.0/20240107042707 + core/coreutils/8.32/20240105213308 + core/findutils/4.9.0/20240105220908 + core/rsync/3.2.3/20240107034222 + core/tar/1.35/20240105214549 + chef/mlsa/1.0.1/20240125084021 # deployment-service uses the postgres11 client to backup/restore postgresql. # we need pg11 because the ha backend uses postgres 11 - core/postgresql13-client + core/postgresql13-client/13.18/20241203070721 ) pkg_bin_dirs=(bin) diff --git a/components/automate-dex/habitat/plan.sh b/components/automate-dex/habitat/plan.sh index 10586bb5c07..6beeb793c2d 100644 --- a/components/automate-dex/habitat/plan.sh +++ b/components/automate-dex/habitat/plan.sh @@ -28,7 +28,7 @@ pkg_deps=( core/curl # health_check hook ) -pkg_build_deps=(core/go22 core/git core/gcc) +pkg_build_deps=(core/go1_22/1.22.5 core/git core/gcc) pkg_scaffolding="${local_scaffolding_origin:-chef}/automate-scaffolding" diff --git a/components/automate-es-gateway/habitat/plan.sh b/components/automate-es-gateway/habitat/plan.sh index 05155698ad4..ac2ec918f86 100644 --- a/components/automate-es-gateway/habitat/plan.sh +++ b/components/automate-es-gateway/habitat/plan.sh @@ -44,9 +44,8 @@ pkg_deps=( core/ncurses core/zlib core/bzip2 - core/openssl/1.0.2zi - core/pcre - + core/openssl + core/pcre2 core/coreutils chef/mlsa core/bash @@ -134,3 +133,4 @@ do_install() { } + diff --git a/components/automate-ha-pgleaderchk/habitat/plan.sh b/components/automate-ha-pgleaderchk/habitat/plan.sh index fe062b8b4b5..0eb15e016d4 100644 --- a/components/automate-ha-pgleaderchk/habitat/plan.sh +++ b/components/automate-ha-pgleaderchk/habitat/plan.sh @@ -46,3 +46,8 @@ do_strip() { return 0 } + +do_before() { + do_default_before + git config --global --add safe.directory /src +} \ No newline at end of file diff --git a/components/automate-knife-ec-backup/habitat/plan.sh b/components/automate-knife-ec-backup/habitat/plan.sh index 246f1d1de81..3bd4f7e9a92 100644 --- a/components/automate-knife-ec-backup/habitat/plan.sh +++ b/components/automate-knife-ec-backup/habitat/plan.sh @@ -1,5 +1,5 @@ # shellcheck disable=SC2148 -UPSTREAM_PKG_IDENT="chef/knife-ec-backup/3.0.1" +UPSTREAM_PKG_IDENT="chef/knife-ec-backup/3.0.1/20240201071926" pkg_name="automate-knife-ec-backup" pkg_description="Wrapper package for chef/knife-ec-backup" pkg_origin="chef" @@ -13,7 +13,7 @@ pkg_svc_user=root pkg_svc_group=root pkg_deps=( - chef/mlsa + chef/mlsa/1.0.1/20240125084021 "${UPSTREAM_PKG_IDENT}" ) @@ -39,3 +39,4 @@ do_end() { return 0 } + diff --git a/components/automate-load-balancer/habitat/plan.sh b/components/automate-load-balancer/habitat/plan.sh index 8b7d84c5622..f77d59c8cfe 100644 --- a/components/automate-load-balancer/habitat/plan.sh +++ b/components/automate-load-balancer/habitat/plan.sh @@ -30,8 +30,8 @@ pkg_deps=( core/ncurses core/zlib core/bzip2 - core/openssl/1.0.2zi - core/pcre + core/openssl/3.0.9 + core/pcre2 chef/mlsa core/bash ) @@ -65,7 +65,7 @@ pkg_binds_optional=( ) do_download() { - cp -f cacert.pem /hab/pkgs/core/cacerts/2021.10.26/20240105224256/ssl/certs/cacert.pem + cp -f cacert.pem /hab/pkgs/core/cacerts/2023.12.12/20241017111624/ssl/certs/cacert.pem do_default_download pushd "${HAB_CACHE_SRC_PATH}" || return 1 download_file "${headers_more_source}" "${headers_more_filename}" "${headers_more_shasum}" @@ -129,3 +129,5 @@ do_install() { cp "${HAB_CACHE_SRC_PATH}/${pkg_dirname}/objs/nginx" "${pkg_prefix}/sbin" } + + diff --git a/components/automate-netcat/habitat/plan.sh b/components/automate-netcat/habitat/plan.sh index 7cf39924fa3..2836c8e078b 100644 --- a/components/automate-netcat/habitat/plan.sh +++ b/components/automate-netcat/habitat/plan.sh @@ -38,3 +38,4 @@ do_end() { return 0 } + diff --git a/components/automate-openjdk/habitat/plan.sh b/components/automate-openjdk/habitat/plan.sh index 17dd9b7fe53..b723a6afeca 100644 --- a/components/automate-openjdk/habitat/plan.sh +++ b/components/automate-openjdk/habitat/plan.sh @@ -18,21 +18,20 @@ pkg_license=("GPL-2.0-with-classpath-exception") pkg_description=('Eclipse Temurin is the open source Java SE build based upon OpenJDK.') pkg_upstream_url=https://adoptium.net/ - pkg_deps=( - core/gcc-libs - core/glibc - core/libxext - core/libxi - core/libxrender - core/libxtst - core/xlib - core/zlib + core/gcc-libs/9.5.0/20240105173910 + core/glibc/2.35/20240105171810 + core/libxext/1.3.4/20240108124758 + core/libxi/1.7.10/20240108173246 + core/libxrender/0.9.10/20240108173201 + core/libxtst/1.2.3/20240108190320 + core/xlib/1.7.2/20240108124426 + core/zlib/1.3/20240105173710 ) pkg_build_deps=( - core/patchelf - core/rsync + core/patchelf/0.13/20240105212025 + core/rsync/3.2.3/20240107034222 ) pkg_bin_dirs=(bin) pkg_lib_dirs=(lib) diff --git a/components/automate-opensearch/habitat/plan.sh b/components/automate-opensearch/habitat/plan.sh index 6b9d4d7d575..7fcde2cc172 100644 --- a/components/automate-opensearch/habitat/plan.sh +++ b/components/automate-opensearch/habitat/plan.sh @@ -17,15 +17,16 @@ pkg_build_deps=( core/patchelf ) pkg_deps=( - core/coreutils - core/glibc - core/zlib - core/bash # hooks - chef/mlsa - core/curl # health_check + core/coreutils/8.32/20240105213308 + core/glibc/2.35/20240105171810 + core/zlib/1.3/20240105173710 + core/bash/5.1/20240105214248 # hooks + chef/mlsa/1.0.1/20240125084021 + core/curl/8.7.1/20240614090648 #healthcheck chef/automate-openjdk - chef/automate-platform-tools + chef/automate-platform-tools/0.1.0/20241212061203 ) + pkg_bin_dirs=(os/bin) pkg_lib_dirs=(lib) diff --git a/components/automate-pg-gateway/habitat/plan.sh b/components/automate-pg-gateway/habitat/plan.sh index 9af982118d6..570be214327 100644 --- a/components/automate-pg-gateway/habitat/plan.sh +++ b/components/automate-pg-gateway/habitat/plan.sh @@ -9,10 +9,10 @@ pkg_maintainer="Chef Software Inc. " pkg_license=('Chef-MLSA') pkg_version="0.0.1" pkg_deps=( - core/bash - core/netcat-openbsd - core/jq-static - core/haproxy + core/bash/5.1/20240105214248 + core/netcat-openbsd/1.226/20240106172343 + core/jq-static/1.6/20240107004905 + core/haproxy/2.2.29/20240106203532 ) @@ -21,9 +21,11 @@ pkg_exposes=(port) pkg_exports=( [port]=service.port ) + pkg_binds=( [automate-postgresql]="port" ) + pkg_description="PostgreSQL Gateway for Chef Automate" pkg_upstream_url="https://www.chef.io/automate" @@ -42,4 +44,3 @@ do_install() { do_strip() { return 0 } - diff --git a/components/automate-platform-tools/habitat/plan.sh b/components/automate-platform-tools/habitat/plan.sh index a96f9b7ea55..9cc8a4a6596 100644 --- a/components/automate-platform-tools/habitat/plan.sh +++ b/components/automate-platform-tools/habitat/plan.sh @@ -28,3 +28,8 @@ do_strip() { } +do_before() { + do_default_before + git config --global --add safe.directory /src +} + diff --git a/components/automate-postgresql/habitat/plan.sh b/components/automate-postgresql/habitat/plan.sh index 755eb366077..b5ffed99f0c 100644 --- a/components/automate-postgresql/habitat/plan.sh +++ b/components/automate-postgresql/habitat/plan.sh @@ -17,8 +17,8 @@ pg_version="13.18" ident="20241203070217" pkg_deps=( - core/coreutils - chef/mlsa + core/coreutils/8.32/20240105213308 + chef/mlsa/1.0.1/20240125084021 ${vendor_origin}/postgresql13/${pg_version}/${ident} ) @@ -41,3 +41,4 @@ do_install() { return 0 } + diff --git a/components/automate-prometheus/habitat/plan.sh b/components/automate-prometheus/habitat/plan.sh index 9be05f91b38..2d7fd900009 100644 --- a/components/automate-prometheus/habitat/plan.sh +++ b/components/automate-prometheus/habitat/plan.sh @@ -38,3 +38,4 @@ do_install() { return 0 } + diff --git a/components/automate-scaffolding-go/habitat/plan.sh b/components/automate-scaffolding-go/habitat/plan.sh index 235a4afc5f8..b0ea9e63221 100644 --- a/components/automate-scaffolding-go/habitat/plan.sh +++ b/components/automate-scaffolding-go/habitat/plan.sh @@ -11,8 +11,8 @@ pkg_version="0.1.0" pkg_license=('Chef-MLSA') pkg_source=nosuchfile.tar.gz pkg_deps=( - core/go22/1.22.5/20240712112719 # This is only pinned to force a scaffolding rebuild to this version - core/git + core/go1_22/1.22.5 # This is only pinned to force a scaffolding rebuild to this version + core/git/2.39.1 ) diff --git a/components/automate-scaffolding/habitat/plan.sh b/components/automate-scaffolding/habitat/plan.sh index d10c04fae77..c73118b725f 100644 --- a/components/automate-scaffolding/habitat/plan.sh +++ b/components/automate-scaffolding/habitat/plan.sh @@ -34,3 +34,4 @@ do_install() { install -D -m 0644 "$PLAN_CONTEXT/../../../lib/scaffolding/templates/"* "$pkg_prefix/lib/templates/" } + diff --git a/components/automate-ui-devproxy/habitat/plan.sh b/components/automate-ui-devproxy/habitat/plan.sh index 2641a57a5de..bc18d62f1e8 100644 --- a/components/automate-ui-devproxy/habitat/plan.sh +++ b/components/automate-ui-devproxy/habitat/plan.sh @@ -33,3 +33,4 @@ do_install() { return 0 } + diff --git a/components/automate-ui/habitat/plan.sh b/components/automate-ui/habitat/plan.sh index 9e8e51827db..469b1433c48 100644 --- a/components/automate-ui/habitat/plan.sh +++ b/components/automate-ui/habitat/plan.sh @@ -7,18 +7,22 @@ pkg_maintainer="Chef Software Inc. " pkg_license=('Chef-MLSA') pkg_svc_user="root" # so we can start nginx properly pkg_deps=( - core/coreutils - core/curl - chef/mlsa + core/coreutils/8.32/20240105213308 + core/curl/8.7.1/20240614090648 + chef/mlsa/1.0.1/20240125084021 core/nginx/1.25.4/20240314072919 - core/jq-static + core/jq-static/1.6/20240107004905 ) + pkg_build_deps=( - core/git - core/make - core/node18/"$(cat "$PLAN_CONTEXT/../.nvmrc")" - core/rsync + core/git/2.33.1/20240614092831 + core/make/4.3/20240105222044 + #core/node18/"$(cat "$PLAN_CONTEXT/../.nvmrc")" + core/node18/18.19.1/20240301044734 + core/rsync/3.2.3/20240107034222 ) + + pkg_exports=( [port]=service.port [host]=service.host @@ -91,3 +95,4 @@ do_after() { rm -rf ~/.netrc } + diff --git a/components/automate-workflow-web/habitat/plan.sh b/components/automate-workflow-web/habitat/plan.sh index 6b960ebcbb8..4254f753995 100644 --- a/components/automate-workflow-web/habitat/plan.sh +++ b/components/automate-workflow-web/habitat/plan.sh @@ -51,3 +51,4 @@ do_build() { do_install() { cp -R dist "$pkg_prefix" } + diff --git a/components/backup-gateway/habitat/plan.sh b/components/backup-gateway/habitat/plan.sh index 906eacae37a..67c541ac111 100644 --- a/components/backup-gateway/habitat/plan.sh +++ b/components/backup-gateway/habitat/plan.sh @@ -6,7 +6,7 @@ pkg_version="0.1.0" pkg_origin=chef pkg_maintainer="Chef Software Inc. " pkg_license=('Apache-2.0') -pkg_build_deps=(core/go22 core/git core/gcc) +pkg_build_deps=(core/go1_22/1.22.5 core/git core/gcc) pkg_bin_dirs=(bin) pkg_deps=( diff --git a/components/compliance-service/habitat/plan.sh b/components/compliance-service/habitat/plan.sh index b9850749b95..3c3be9f4967 100644 --- a/components/compliance-service/habitat/plan.sh +++ b/components/compliance-service/habitat/plan.sh @@ -35,14 +35,14 @@ pkg_binds_optional=( pkg_svc_user=root inspec_release="chef/inspec/4.56.61/20240809111842" pkg_deps=( - core/coreutils - "${local_platform_tools_origin:-chef}/automate-platform-tools" + core/coreutils/8.32/20240105213308 + chef/automate-platform-tools/0.1.0/20241212061203 "${inspec_release}" - chef/mlsa - core/grpcurl # Used in habitat/hooks/health_check - core/jq-static # Used in habitat/hooks/health_check - core/bash - core/firejail + chef/mlsa/1.0.1/20240125084021 + core/grpcurl/1.8.5/20240109144108 # Used in habitat/hooks/health_check + core/jq-static/1.6/20240107004905 # Used in habitat/hooks/health_check + core/bash/5.1/20240105214248 + core/firejail/0.9.72/20240109161319 ) if [[ -n "$AUTOMATE_OSS_BUILD" ]]; then diff --git a/components/data-lifecycle-service/habitat/plan.sh b/components/data-lifecycle-service/habitat/plan.sh index 7650493edb7..bb3c8df90e0 100644 --- a/components/data-lifecycle-service/habitat/plan.sh +++ b/components/data-lifecycle-service/habitat/plan.sh @@ -26,3 +26,5 @@ do_strip() { : } + + diff --git a/components/license-control-service/habitat/plan.sh b/components/license-control-service/habitat/plan.sh index 7926dc2f99f..86bff08309c 100644 --- a/components/license-control-service/habitat/plan.sh +++ b/components/license-control-service/habitat/plan.sh @@ -13,7 +13,7 @@ pkg_license=('Chef-MLSA') pkg_deps=( chef/mlsa chef/automate-platform-tools - chef/license-audit + chef/license-audit/1.0.36/20240729060411 ) pkg_svc_user=root pkg_svc_group=root @@ -44,3 +44,4 @@ do_install() { + diff --git a/components/local-user-service/habitat/plan.sh b/components/local-user-service/habitat/plan.sh index c57d7ef8f87..82676d222dc 100644 --- a/components/local-user-service/habitat/plan.sh +++ b/components/local-user-service/habitat/plan.sh @@ -40,3 +40,7 @@ do_strip() { } +do_before() { + do_default_before + git config --global --add safe.directory /src +} \ No newline at end of file diff --git a/components/notifications-service/habitat/plan.sh b/components/notifications-service/habitat/plan.sh index addf921af0a..c63a41e0ecb 100644 --- a/components/notifications-service/habitat/plan.sh +++ b/components/notifications-service/habitat/plan.sh @@ -10,30 +10,30 @@ pkg_license=('Chef-MLSA') pkg_upstream_url="http://github.com/chef/automate" pkg_deps=( - core/coreutils + core/coreutils/8.32/20240105213308 # bash is required by distillery - core/bash - chef/mlsa - ${local_platform_tools_origin:-chef}/automate-platform-tools - core/busybox-static + core/bash/5.1/20240105214248 + chef/mlsa/1.0.1/20240125084021 + chef/automate-platform-tools/0.1.0/20241212061203 + core/busybox-static/1.34.1/20240105230035 ) pkg_build_deps=( - core/git + core/git/2.33.1/20240614092831 # Node(kallol) 2022-01-28: # # We have seen failures with notification service http request # with external services. This is because the erlang version was bumped to # v23.2. Hence pinning the version till we have a fix. - core/erlang25 + core/erlang25/25.0.4/20240108042737 # NOTE(ssd) 2019-07-03: PIN PIN PIN # # elixir 1.9.0 shipped with a number of changes to how releases # work. This appears to have broken the build. Pinning until we can # sort out the required changes. - core/elixir - core/glibc + core/elixir/1.14.0/20240108043326 + core/glibc/2.35/20240105171810 ) pkg_binds=( @@ -65,7 +65,7 @@ pkg_srcs=( # TODO: VERSION should be in this list ) -pkg_scaffolding="${local_scaffolding_origin:-chef}/automate-scaffolding" +pkg_scaffolding="chef/automate-scaffolding/0.1.0/20241128083033" do_unpack() { mkdir -p "${CACHE_PATH}/server" @@ -79,7 +79,6 @@ do_unpack() { do_prepare() { localedef -i en_US -f UTF-8 en_US.UTF-8 export LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 - export MIX_HOME="${CACHE_PATH}/.mix" export HEX_HOME="${CACHE_PATH}/.hex" mix local.hex --force diff --git a/components/notifications-service2/habitat/plan.sh b/components/notifications-service2/habitat/plan.sh index 3ba2cd43516..9c884111c97 100644 --- a/components/notifications-service2/habitat/plan.sh +++ b/components/notifications-service2/habitat/plan.sh @@ -61,3 +61,4 @@ do_strip() { } + diff --git a/components/trial-license-service/habitat/plan.sh b/components/trial-license-service/habitat/plan.sh index 12ac0fc0f4d..0e84e2b63e5 100644 --- a/components/trial-license-service/habitat/plan.sh +++ b/components/trial-license-service/habitat/plan.sh @@ -33,3 +33,8 @@ do_strip() { return 0 } + +do_before() { + do_default_before + git config --global --add safe.directory /src +} diff --git a/integration/helpers/cert_auth_tests.sh b/integration/helpers/cert_auth_tests.sh index 91ff398e9db..9eb48a273e2 100644 --- a/integration/helpers/cert_auth_tests.sh +++ b/integration/helpers/cert_auth_tests.sh @@ -92,10 +92,10 @@ EOF invalid_cert_test_gateway() { local result result=$(hab_curl -o /dev/null -sS --insecure --cert "$(invalid_cert_path)" --key "$(invalid_key_path)" "https://localhost:2000/events/data-collector" || echo "$?") - if [ "$result" != "35" ]; then + if [ "$result" != "56" ]; then cat < /etc/systemd/system/requestbin.service <