Skip to content

Commit

Permalink
LTS channel (#8714)
Browse files Browse the repository at this point in the history
* testCurl8

Signed-off-by: SahithiMy <[email protected]>

* testCurl8

Signed-off-by: SahithiMy <[email protected]>

* nginx pipeline fix

Signed-off-by: SahithiMy <[email protected]>

* automate-cluster-ctl pipeline fix

Signed-off-by: SahithiMy <[email protected]>

* removed pinned version

Signed-off-by: SahithiMy <[email protected]>

* Rebasing

Signed-off-by: SahithiMy <[email protected]>

* GOlang update to version 1.22.0

Signed-off-by: daveaugustus <[email protected]>

* golang v1.22.5

Signed-off-by: daveaugustus <[email protected]>

* Modified Go version in all the files

Signed-off-by: daveaugustus <[email protected]>

* Pipeline check

Signed-off-by: daveaugustus <[email protected]>

* Pipeline check

Signed-off-by: daveaugustus <[email protected]>

* Pipeline check

Signed-off-by: daveaugustus <[email protected]>

* Pipeline check

Signed-off-by: daveaugustus <[email protected]>

* proto check

Signed-off-by: daveaugustus <[email protected]>

* Compiled protobuf with upgraded Golang v1.22.5

Signed-off-by: daveaugustus <[email protected]>

* Downgraded packages

Signed-off-by: daveaugustus <[email protected]>

* Protobuf compiles newly added messages and services

Signed-off-by: daveaugustus <[email protected]>

* Modified go mod downgrading some dependency for authz errors

Signed-off-by: daveaugustus <[email protected]>

* Added GOPROXY

Signed-off-by: daveaugustus <[email protected]>

* GOPROXY

Signed-off-by: daveaugustus <[email protected]>

* Downgraded linter

Signed-off-by: daveaugustus <[email protected]>

* Go linter modification

Signed-off-by: daveaugustus <[email protected]>

* Removed enable unused

Signed-off-by: daveaugustus <[email protected]>

* Downgraded protoc-gen-validate

Signed-off-by: daveaugustus <[email protected]>

* package update

Signed-off-by: daveaugustus <[email protected]>

* Downgraded grpc gateway

Signed-off-by: daveaugustus <[email protected]>

* Regenerated code

Signed-off-by: daveaugustus <[email protected]>

* Added golangci

Signed-off-by: daveaugustus <[email protected]>

* Pipeline fix (#8563)

* removing unnecessary changes

Signed-off-by: Durga Sarat Chandra Maddu <[email protected]>

* fixing cert error message

Signed-off-by: Durga Sarat Chandra Maddu <[email protected]>

* updating the code

Signed-off-by: Durga Sarat Chandra Maddu <[email protected]>

---------

Signed-off-by: Durga Sarat Chandra Maddu <[email protected]>

* Dave/pipeline fix (#8564)

* downgraded packages

Signed-off-by: daveaugustus <[email protected]>

* upgraded linter

Signed-off-by: daveaugustus <[email protected]>

* downgraded elastic search package

Signed-off-by: daveaugustus <[email protected]>

* downgraded elastic search package

Signed-off-by: daveaugustus <[email protected]>

* increased timeout

Signed-off-by: daveaugustus <[email protected]>

* Added timeout for channels

Signed-off-by: daveaugustus <[email protected]>

* modified the test case

Signed-off-by: daveaugustus <[email protected]>

* Added timeout for channels

Signed-off-by: daveaugustus <[email protected]>

* Fixed pipeline closing issue ingest service

Signed-off-by: daveaugustus <[email protected]>

* fixed testcases ingest service

Signed-off-by: daveaugustus <[email protected]>

* Changes in for range

Signed-off-by: daveaugustus <[email protected]>

* Changes in for range

Signed-off-by: daveaugustus <[email protected]>

* Modified for loops

Signed-off-by: daveaugustus <[email protected]>

* error corrections

Signed-off-by: daveaugustus <[email protected]>

* reverted timeout

Signed-off-by: daveaugustus <[email protected]>

---------

Signed-off-by: daveaugustus <[email protected]>
Co-authored-by: daveaugustus <[email protected]>

* Checking repo health

Signed-off-by: Yashvi Jain <[email protected]>

* testing pipeline

Signed-off-by: Yashvi Jain <[email protected]>

* testing by upgrading golag

Signed-off-by: Yashvi Jain <[email protected]>

* testing by upgrading golag

Signed-off-by: Yashvi Jain <[email protected]>

* commented license scout

Signed-off-by: iamazzeez <[email protected]>

* build pipeline fix

Signed-off-by: iamazzeez <[email protected]>

* nats version downgrade

Signed-off-by: iamazzeez <[email protected]>

* nats server upgrade

Signed-off-by: iamazzeez <[email protected]>

* reverted nates upgrade

Signed-off-by: iamazzeez <[email protected]>

* Dave/verify private fix 2 (#8579)

* Restored license control

Signed-off-by: daveaugustus <[email protected]>

* Added go proxy

Signed-off-by: daveaugustus <[email protected]>

* Updated mod

Signed-off-by: daveaugustus <[email protected]>

* modified test case

Signed-off-by: daveaugustus <[email protected]>

* Added error check for server instance

Signed-off-by: daveaugustus <[email protected]>

* grpc

Signed-off-by: daveaugustus <[email protected]>

* fixed mod

Signed-off-by: daveaugustus <[email protected]>

---------

Signed-off-by: daveaugustus <[email protected]>
Co-authored-by: daveaugustus <[email protected]>

* added go.sum dependency

Signed-off-by: daveaugustus <[email protected]>

* license scout fix

Signed-off-by: iamazzeez <[email protected]>

* repo health fix

Signed-off-by: iamazzeez <[email protected]>

* modified pacnic check

Signed-off-by: daveaugustus <[email protected]>

* Update storage.go

* undefined log

Signed-off-by: daveaugustus <[email protected]>

* Test

Signed-off-by: daveaugustus <[email protected]>

* Revised the test cases

Signed-off-by: daveaugustus <[email protected]>

* all go upgrade latest fixes

Signed-off-by: iamazzeez <[email protected]>

* Pipeline for LTS Channel and go_1_22.4

Signed-off-by: daveaugustus <[email protected]>

* Modification in go version

Signed-off-by: daveaugustus <[email protected]>

* changed fallback to stable

Signed-off-by: daveaugustus <[email protected]>

* Getting correct package for core ruby

Signed-off-by: Yashvi Jain <[email protected]>

* Getting correct package for core ruby

Signed-off-by: Yashvi Jain <[email protected]>

* studio common updated LTS

Signed-off-by: daveaugustus <[email protected]>

* Updated git version

Signed-off-by: daveaugustus <[email protected]>

* Commenting a environment variable to pick local builds

Signed-off-by: Yashvi Jain <[email protected]>

* Testing if ignore local works

Signed-off-by: Yashvi Jain <[email protected]>

* Testing if ignore local works

Signed-off-by: Yashvi Jain <[email protected]>

* Checking if we can build platform tools by adding do_before function

Signed-off-by: Yashvi Jain <[email protected]>

* Adding an extra space in scaffolding

Signed-off-by: Yashvi Jain <[email protected]>

* gov1.22.4 to go1.22.5

Signed-off-by: daveaugustus <[email protected]>

* ccore-->core

Signed-off-by: daveaugustus <[email protected]>

* Skipping compliance service build

Signed-off-by: daveaugustus <[email protected]>

* Skipping es-gateway service build

Signed-off-by: daveaugustus <[email protected]>

* Skipping components/automate-cs-oc-erchef service build

Signed-off-by: daveaugustus <[email protected]>

* Skipping components/automate-cs-ocid service build

Signed-off-by: daveaugustus <[email protected]>

* Skipping components/automate-cs-ocid service build

Signed-off-by: daveaugustus <[email protected]>

* Adding components in skip

Signed-off-by: Yashvi Jain <[email protected]>

* Adding components in skip

Signed-off-by: Yashvi Jain <[email protected]>

* Skipping build

Signed-off-by: daveaugustus <[email protected]>

* Adding components in skip

Signed-off-by: Yashvi Jain <[email protected]>

* Adding components in skip

Signed-off-by: Yashvi Jain <[email protected]>

* Skipping build

Signed-off-by: daveaugustus <[email protected]>

* Skipping build

Signed-off-by: daveaugustus <[email protected]>

* Skipping build

Signed-off-by: daveaugustus <[email protected]>

* Adding build for hs opensearch

Signed-off-by: Yashvi Jain <[email protected]>

* Adding build for hs opensearch

Signed-off-by: Yashvi Jain <[email protected]>

* skpi components/automate-ha-pgleaderchk

Signed-off-by: daveaugustus <[email protected]>

* skpi components/automate-opensearch

Signed-off-by: daveaugustus <[email protected]>

* build pg gateway

Signed-off-by: daveaugustus <[email protected]>

* - Uncommented opensearch

* removed automate-backend-elasticsidecar

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* removed automate-backend-opensearch

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* removed automate-builder-api-proxy

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* removed automate-builder-api

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* automate-builder-memcached

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* adding space in automate-debug

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* removed automate-minio

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* space

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* removed automate-cs-ocid

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* removed automate-cs-nginx

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* removed automate-cs-oc-erchef

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* removed automate-es-gateway

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* removed compliance-service

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* adding all skipped components

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* build data-life-cycle

Signed-off-by: swatign <[email protected]>

* build automate-load-balancer

Signed-off-by: swatign <[email protected]>

* adding all the components which are missed from the build

Signed-off-by: swatign <[email protected]>

* skipping automate-load-balancer

Signed-off-by: swatign <[email protected]>

* skipping automate-postgresql

Signed-off-by: swatign <[email protected]>

* skipping automate-prometheus

Signed-off-by: swatign <[email protected]>

* skipping automate-backend-ctl

Signed-off-by: swatign <[email protected]>

* skipping automate-backend-ctl

Signed-off-by: swatign <[email protected]>

* skipping automate-cluster-ctl

Signed-off-by: swatign <[email protected]>

* skipping automate-backend-deployment

Signed-off-by: swatign <[email protected]>

* adding automate-ui to skip list

Signed-off-by: swatign <[email protected]>

* triggering data-life-cycle again

Signed-off-by: swatign <[email protected]>

* adding core/pcre2 in the automate-load-balancer

Signed-off-by: swatign <[email protected]>

* adding core/pcre2 in the automate-load-balancer and removed from skip list

Signed-off-by: swatign <[email protected]>

* updating openssl to 3.0.9

Signed-off-by: swatign <[email protected]>

* updating openssl to 3.0.9 and pcre2 in automate-es-gateway

Signed-off-by: swatign <[email protected]>

* trigerring pipelines

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* pinning openssl version

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* removing pinned version and trigerring lcs

Signed-off-by: Aishwarya Aishwarya <[email protected]>

* checking automate-es-gateway

Signed-off-by: swatign <[email protected]>

* openssl 3.0.9 in automate-es-gateway

Signed-off-by: swatign <[email protected]>

* updating go.mod

Signed-off-by: Yashvi Jain <[email protected]>

* updating go.mod

Signed-off-by: Yashvi Jain <[email protected]>

* updating go.mod

Signed-off-by: Yashvi Jain <[email protected]>

* sync go.mod

Signed-off-by: Yashvi Jain <[email protected]>

* Adding pinged versions

Signed-off-by: Yashvi Jain <[email protected]>

* More packages from stable channel pinged

Signed-off-by: Yashvi Jain <[email protected]>

* notification service from stable channel

Signed-off-by: Yashvi Jain <[email protected]>

* Checking license scout

Signed-off-by: Yashvi Jain <[email protected]>

* fixing verify main pipeline

Signed-off-by: Sahiba3108 <[email protected]>

* Adding license scout changes

Signed-off-by: Yashvi Jain <[email protected]>

* Adding certs and chcking builds

Signed-off-by: Yashvi Jain <[email protected]>

* checking license scout

Signed-off-by: Yashvi Jain <[email protected]>

* checking license scout

Signed-off-by: Yashvi Jain <[email protected]>

* fixing verify main pipeline

Signed-off-by: Sahiba3108 <[email protected]>

* SSL_CERT_FILE_ADDED

Signed-off-by: Sahiba3108 <[email protected]>

* SSL_CERT_FILE_ADDED

Signed-off-by: Sahiba3108 <[email protected]>

* Adding pipeline fixes

Signed-off-by: Yashvi Jain <[email protected]>

* Checking pipeline VCS error

Signed-off-by: Yashvi Jain <[email protected]>

* protobuf pipline

Signed-off-by: Yashvi Jain <[email protected]>

* protobuf

Signed-off-by: Yashvi Jain <[email protected]>

* Adding fix for repo health

Signed-off-by: Yashvi Jain <[email protected]>

* Adding correct version of ruby

Signed-off-by: Yashvi Jain <[email protected]>

* Correct protobuf and repo health

Signed-off-by: Yashvi Jain <[email protected]>

* Adding git config for automate-gateway

Signed-off-by: Yashvi Jain <[email protected]>

* Adding spellcheck older version

Signed-off-by: Yashvi Jain <[email protected]>

* Adding spellcheck older version

Signed-off-by: Yashvi Jain <[email protected]>

* Removing ssl cert line

Signed-off-by: Yashvi Jain <[email protected]>

* exporting ssl cert file

Signed-off-by: Sahiba3108 <[email protected]>

* fixing repo health

Signed-off-by: Sahiba3108 <[email protected]>

* removing more from verify build

Signed-off-by: Yashvi Jain <[email protected]>

* Changing ruby package to ruby3_1

Signed-off-by: Yashvi Jain <[email protected]>

* pinned versions

Signed-off-by: Sahiba3108 <[email protected]>

* pinned versions for automate-backend-ctl

Signed-off-by: Sahiba3108 <[email protected]>

* ping openssl in load balancer

Signed-off-by: Yashvi Jain <[email protected]>

* Removing openssl 3 dependency

Signed-off-by: Yashvi Jain <[email protected]>

* Removing more components from skip

Signed-off-by: Yashvi Jain <[email protected]>

* Adding correct package of builder

Signed-off-by: Yashvi Jain <[email protected]>

* Pining the postgres client version

Signed-off-by: Yashvi Jain <[email protected]>

* adding ui build

Signed-off-by: Yashvi Jain <[email protected]>

* Checking for stable package with curl in product integration tests

Signed-off-by: Yashvi Jain <[email protected]>

* Adding build pipeline as well from LTS channel

Signed-off-by: Yashvi Jain <[email protected]>

* Removing go mod changes

Signed-off-by: Yashvi Jain <[email protected]>

* Changing the error code

Signed-off-by: Yashvi Jain <[email protected]>

* Checking the builds

Signed-off-by: Yashvi Jain <[email protected]>

* Adding fallback channel as lts

Signed-off-by: Yashvi Jain <[email protected]>

* Removing skipping components

Signed-off-by: Yashvi Jain <[email protected]>

* Adding knife ec backup and license audit from stable channel

Signed-off-by: Yashvi Jain <[email protected]>

* correct node18 build

Signed-off-by: Yashvi Jain <[email protected]>

* changing habitat channel to test channel

Signed-off-by: Yashvi Jain <[email protected]>

* Adding infra server packages

Signed-off-by: Yashvi Jain <[email protected]>

* Adding new packages

Signed-off-by: Yashvi Jain <[email protected]>

* Fixing build for HA

Signed-off-by: Yashvi Jain <[email protected]>

* Changing the packages

Signed-off-by: Yashvi Jain <[email protected]>

* reseting files from main

Signed-off-by: Yashvi Jain <[email protected]>

* resting more files from local

Signed-off-by: Yashvi Jain <[email protected]>

* resting more files from local

Signed-off-by: Yashvi Jain <[email protected]>

* Removing protobuff version

Signed-off-by: Yashvi Jain <[email protected]>

* version of v1.pb.go

Signed-off-by: Yashvi Jain <[email protected]>

* Correcting the pipeline

Signed-off-by: Yashvi Jain <[email protected]>

* rep health fix

Signed-off-by: Yashvi Jain <[email protected]>

* pipeline fix

Signed-off-by: Yashvi Jain <[email protected]>

* Picking up go dependencies from main branch

Signed-off-by: Yashvi Jain <[email protected]>

* Picking up go dependencies from main branch

Signed-off-by: Yashvi Jain <[email protected]>

* Picking up go dependencies from main branch

Signed-off-by: Yashvi Jain <[email protected]>

* Picking up go dependencies from main branch

Signed-off-by: Yashvi Jain <[email protected]>

* Picking up go dependencies from main branch

Signed-off-by: Yashvi Jain <[email protected]>

* Picking up go dependencies from main branch

Signed-off-by: Yashvi Jain <[email protected]>

* Picking up go dependencies from main branch

Signed-off-by: Yashvi Jain <[email protected]>

* Picking up go dependencies from main branch

Signed-off-by: Yashvi Jain <[email protected]>

* Picking up go dependencies from main branch

Signed-off-by: Yashvi Jain <[email protected]>

* Picking up go dependencies from main branch

Signed-off-by: Yashvi Jain <[email protected]>

* update allignment

Signed-off-by: Durga Sarat Chandra Maddu <[email protected]>

* Adding review comments changes which removes unwanted comments and folders

Signed-off-by: Yashvi Jain <[email protected]>

---------

Signed-off-by: SahithiMy <[email protected]>
Signed-off-by: daveaugustus <[email protected]>
Signed-off-by: Durga Sarat Chandra Maddu <[email protected]>
Signed-off-by: Yashvi Jain <[email protected]>
Signed-off-by: iamazzeez <[email protected]>
Signed-off-by: Aishwarya Aishwarya <[email protected]>
Signed-off-by: swatign <[email protected]>
Signed-off-by: Sahiba3108 <[email protected]>
Signed-off-by: Yashvi Jain <[email protected]>
Co-authored-by: SahithiMy <[email protected]>
Co-authored-by: daveaugustus <[email protected]>
Co-authored-by: Durga Sarat Chandra Maddu <[email protected]>
Co-authored-by: Augusutus <[email protected]>
Co-authored-by: Yashvi Jain <[email protected]>
Co-authored-by: iamazzeez <[email protected]>
Co-authored-by: Aishwarya Aishwarya <[email protected]>
Co-authored-by: swatign <[email protected]>
Co-authored-by: Sahiba3108 <[email protected]>
Co-authored-by: dmaddu <[email protected]>
  • Loading branch information
11 people authored Jan 23, 2025
1 parent 3d63d89 commit f580dd0
Show file tree
Hide file tree
Showing 59 changed files with 291 additions and 178 deletions.
2 changes: 1 addition & 1 deletion .expeditor/build.habitat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .expeditor/generate-automate-cli-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .expeditor/license_scout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
9 changes: 6 additions & 3 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .expeditor/verify_private.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
32 changes: 31 additions & 1 deletion .license_scout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ habitat:
- origin: chef
channel: dev
- origin: core
channel: stable
channel: LTS-2024
allowed_licenses:
- 0BSD
- Apache-1.0
Expand Down Expand Up @@ -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
Expand Down
14 changes: 9 additions & 5 deletions .studio/common
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ document "verify_products_generation" <<DOC
DOC
function verify_products_generation() {
install_if_missing core/git git

git config --global --add safe.directory /go/src/github.com/chef/automate
git config --global --add safe.directory '*'

deployment_generate || return $?

git add .
Expand Down Expand Up @@ -98,7 +100,7 @@ function link_component_bin() {
}

function desired_golang_ident() {
echo "core/go22/$(cat /src/GOLANG_VERSION)"
echo "core/go1_22/$(cat /src/GOLANG_VERSION)"
}

function verify_components_have_platform_config() {
Expand Down Expand Up @@ -202,13 +204,15 @@ EOF
function build() {
local hab_build
#set HAB_BLDR_CHANNEL to dev as part of the hab package refresh
local HAB_BLDR_CHANNEL=dev
local HAB_BLDR_CHANNEL=LTS-2024

# Support for hab v.0.63.0
if [ -f /bin/build ]; then
hab_build=/bin/build
fi

echo "Building from channel: $HAB_BLDR_CHANNEL"

# Support prior hab versions
if [ -f /hab/bin/build ]; then
hab_build=/hab/bin/build
Expand All @@ -217,7 +221,7 @@ function build() {
if [ -z "$hab_build" ]; then
exit_with "Hab build binary not found. Verify the 'build' wrapper inside the studio." 22
else
HAB_FEAT_IGNORE_LOCAL=true HAB_BLDR_CHANNEL=${HAB_BLDR_CHANNEL:-dev} $hab_build "$@"
HAB_FEAT_IGNORE_LOCAL=false HAB_BLDR_CHANNEL=${HAB_BLDR_CHANNEL:-LTS-2024} $hab_build "$@"
fi
}

Expand Down Expand Up @@ -356,7 +360,7 @@ function build_all_changed_components() {
local whitelist=$*

install_if_missing core/git git
install_if_missing core/ruby ruby
install_if_missing core/ruby/3.0.6/20240108025751 ruby
hab pkg binlink core/ruby gem
gem install toml
hab pkg install core/coreutils >/dev/null
Expand Down
2 changes: 1 addition & 1 deletion .studio/compliance-service
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .studio/golang
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ DOC
function go_component_unit() {
install_go

GOFLAGS=-buildvcs=false

VERBOSE_TESTS=
if [[ "$1" == "-v" ]]; then
VERBOSE_TESTS=$1
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .studio/protobuf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ document "install_protoc_toolchain" <<DOC
Install all the protobuf plugins, linters, etc. we use to compile and vet our protobufs.
DOC
function install_protoc_toolchain() {
install_if_missing core/protobuf-cpp protoc
install_if_missing core/protobuf-cpp/3.19.0/20240106033100 protoc
install_go_tool github.com/golang/protobuf/protoc-gen-go
compile_go_protobuf api/scripts/bootstrap_protoc.sh
compile_go_protobuf components/automate-grpc/scripts/bootstrap_protoc.sh
Expand Down Expand Up @@ -240,7 +240,8 @@ document "verify_all_protobuf_components" <<DOC
DOC
function verify_all_protobuf_components() {
install_if_missing core/git git

git config --global --add safe.directory /go/src/github.com/chef/automate
git config --global --add safe.directory '*'
clean_all_compiled_protos || return $?
bootstrap_proto_compilers || return $?
compile_all_protobuf_components || return $?
Expand Down
5 changes: 3 additions & 2 deletions .studiorc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RECOMMENDED_HAB_VERSION="1.6.1205"
GOLANGCILINTVERSION=1.60.1

# TODO(ssd) 2019-11-19: https://github.com/habitat-sh/habitat/issues/7219
unset SSL_CERT_FILE
# unset SSL_CERT_FILE

# TODO (tc) Let's get rid of this hard-coded config long-term.
# Opensearch
Expand All @@ -32,7 +32,8 @@ export GATEWAY_PORT=2000
export CGO_ENABLED=0
export GOPROXY="https://proxy.golang.org,direct"
export GOSUMDB="sum.golang.org"

SSL_CERT_FILE="/hab/pkgs/$(hab pkg list core/cacerts)/ssl/cert.pem"
export SSL_CERT_FILE
# Go >= 1.13 will assume this but we have tools like protoc extensions that
# look for it.
export GO111MODULE=on
Expand Down
21 changes: 11 additions & 10 deletions components/automate-backend-ctl/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -101,3 +101,4 @@ EOF
chmod -v 755 "$bin"
}


3 changes: 2 additions & 1 deletion components/automate-backend-deployment/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -129,3 +129,4 @@ do_strip() {




6 changes: 3 additions & 3 deletions components/automate-backend-elasticsidecar/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down
1 change: 1 addition & 0 deletions components/automate-backend-haproxy/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ do_install() {
return 0
}


22 changes: 11 additions & 11 deletions components/automate-backend-opensearch/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 5 additions & 3 deletions components/automate-backend-postgresql/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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}"
)

Expand Down Expand Up @@ -52,3 +52,5 @@ do_end() {
return 0
}



Loading

0 comments on commit f580dd0

Please sign in to comment.