From 19a3eb3aba210654544149d40ceee6ba1dbc9114 Mon Sep 17 00:00:00 2001 From: Henrique Santos Date: Fri, 13 Oct 2023 17:53:45 +0100 Subject: [PATCH 1/2] Remove GOPRIVATE logic --- scripts/generate-sdk/generate-sdk.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/generate-sdk/generate-sdk.sh b/scripts/generate-sdk/generate-sdk.sh index 34a2b65..8506aac 100755 --- a/scripts/generate-sdk/generate-sdk.sh +++ b/scripts/generate-sdk/generate-sdk.sh @@ -24,7 +24,6 @@ fi cleanup() { rm -rf ${sdk_services_backup_dir} - go env -w GOPRIVATE=${goprivate_backup} } if type -p java >/dev/null; then @@ -75,10 +74,6 @@ git clone ${SDK_REPO_URL} ${SDK_REPO_LOCAL_PATH} cd ${SDK_REPO_LOCAL_PATH} make project-tools -# Set GOPRIVATE to download the SDK Go module -goprivate_backup=$(go env GOPRIVATE) -go env -w GOPRIVATE="github.com/stackitcloud" - # Save and remove SDK services/ cp -a "${SDK_REPO_LOCAL_PATH}/services/." ${sdk_services_backup_dir} rm -rf ${SDK_REPO_LOCAL_PATH}/services From 375e234203fe26ede1d0f5e8f0f787a70d2a9d8d Mon Sep 17 00:00:00 2001 From: Henrique Santos Date: Fri, 13 Oct 2023 17:54:39 +0100 Subject: [PATCH 2/2] Add sync-tidy --- scripts/generate-sdk/generate-sdk.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/generate-sdk/generate-sdk.sh b/scripts/generate-sdk/generate-sdk.sh index 8506aac..1d80d17 100755 --- a/scripts/generate-sdk/generate-sdk.sh +++ b/scripts/generate-sdk/generate-sdk.sh @@ -155,3 +155,4 @@ done # Cleanup after SDK generation cd ${SDK_REPO_LOCAL_PATH} goimports -w ${SDK_REPO_LOCAL_PATH}/services/ +make sync-tidy