diff --git a/.expeditor/generate-automate-cli-docs.sh b/.expeditor/generate-automate-cli-docs.sh index de4c548fe00..a01002094c9 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/1.22.5 --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 9be433f89d5..73c861c6e6d 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 @@ -1532,6 +1532,32 @@ 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 ruby: - name: highline @@ -1820,4 +1846,3 @@ exceptions: reason: Exception made by Chef Legal - name: golang.org/x/telemetry reason: Exception made by Chef Legal - 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 b97c5293722..19a83536c32 100644 --- a/.studio/protobuf +++ b/.studio/protobuf @@ -21,7 +21,7 @@ document "install_protoc_toolchain" < /etc/systemd/system/requestbin.service <