From bb6d0fd7c67e1f27c64437dcb6c41b779cc89735 Mon Sep 17 00:00:00 2001 From: Tuan Dang Date: Sun, 30 Apr 2023 14:56:27 +0300 Subject: [PATCH 1/9] Patch .secretValue access in INVITE_ONLY_SIGNUP --- backend/src/config/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 4c6bed800..5dce2bc09 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -5,7 +5,7 @@ const client = new InfisicalClient({ }); export const getPort = async () => (await client.getSecret('PORT')).secretValue || 4000; -export const getInviteOnlySignup = async () => (await client.getSecret('INVITE_ONLY_SIGNUP')).secretValue == undefined ? false : await client.getSecret('INVITE_ONLY_SIGNUP'); +export const getInviteOnlySignup = async () => (await client.getSecret('INVITE_ONLY_SIGNUP')).secretValue == undefined ? false : (await client.getSecret('INVITE_ONLY_SIGNUP')).secretValue; export const getEncryptionKey = async () => (await client.getSecret('ENCRYPTION_KEY')).secretValue; export const getSaltRounds = async () => parseInt((await client.getSecret('SALT_ROUNDS')).secretValue) || 10; export const getJwtAuthLifetime = async () => (await client.getSecret('JWT_AUTH_LIFETIME')).secretValue || '10d'; From 1401c7f6bc9e98fe20736e53c555765d569239e3 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Sun, 30 Apr 2023 10:32:39 -0400 Subject: [PATCH 2/9] add go releaser pro --- .github/workflows/release_build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index af395ce6c..70ca71dba 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -41,13 +41,14 @@ jobs: git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target - uses: goreleaser/goreleaser-action@v4 with: - distribution: goreleaser + distribution: pro version: latest args: release --clean env: GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }} FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }} AUR_KEY: ${{ secrets.AUR_KEY }} + GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} - uses: actions/setup-python@v4 - run: pip install --upgrade cloudsmith-cli - name: Publish to CloudSmith From 55ca6938db0ede52f66fe8c091af0b530f4f478e Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Sun, 30 Apr 2023 11:08:58 -0400 Subject: [PATCH 3/9] update cli github action to only listen to infisical-cli/{version} tags --- .github/workflows/release_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 70ca71dba..82fac8f2a 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -4,7 +4,7 @@ on: push: # run only against tags tags: - - "v*" + - "infisical-cli/v*.*.*" permissions: contents: write From ec97e1a9301a880b4a2a142c6a23db1c948618ea Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Sun, 30 Apr 2023 11:09:29 -0400 Subject: [PATCH 4/9] add mono repo support for goreleaser --- .goreleaser.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index dfcacf59d..3ebb3fc3f 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -11,6 +11,10 @@ before: - ./cli/scripts/completions.sh - ./cli/scripts/manpages.sh +monorepo: + tag_prefix: infisical-cli/ + dir: cli + builds: - id: darwin-build binary: infisical @@ -74,14 +78,7 @@ checksum: name_template: "checksums.txt" snapshot: - name_template: "{{ incpatch .Version }}-devel" - -changelog: - sort: asc - filters: - exclude: - - "^docs:" - - "^test:" + name_template: "{{ .Version }}-devel" # publishers: # - name: fury.io From a6e670e93a19ed9d7a9bd04201e3d4f6c9b6c763 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Sun, 30 Apr 2023 11:22:28 -0400 Subject: [PATCH 5/9] update tag fetch method to filetr for cli tags only --- cli/packages/util/check-for-update.go | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/cli/packages/util/check-for-update.go b/cli/packages/util/check-for-update.go index 2f283070c..0c73c28dc 100644 --- a/cli/packages/util/check-for-update.go +++ b/cli/packages/util/check-for-update.go @@ -4,12 +4,14 @@ import ( "encoding/json" "errors" "fmt" - log "github.com/sirupsen/logrus" "io" "net/http" "os" "os/exec" "runtime" + "strings" + + log "github.com/sirupsen/logrus" "github.com/fatih/color" ) @@ -73,7 +75,23 @@ func getLatestTag(repoOwner string, repoName string) (string, error) { return "", fmt.Errorf("failed to unmarshal github response: %w", err) } - return tags[0].Name[1:], nil + // Filter tags with prefix "infisical-cli/" + prefix := "infisical-cli/" + var validTags []string + for _, tag := range tags { + if strings.HasPrefix(tag.Name, prefix) { + validTags = append(validTags, tag.Name) + } + } + + if len(validTags) == 0 { + return "", errors.New("no tags for the CLI is found") + } + + // Extract the version from the first valid tag + version := strings.TrimPrefix(validTags[0], prefix) + + return version, nil } func GetUpdateInstructions() string { From 9f0313f50b2f21f70479a418185dd2db0f750967 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Sun, 30 Apr 2023 11:28:55 -0400 Subject: [PATCH 6/9] strip v from existing tags --- cli/packages/util/check-for-update.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/packages/util/check-for-update.go b/cli/packages/util/check-for-update.go index 0c73c28dc..53eb6dfb7 100644 --- a/cli/packages/util/check-for-update.go +++ b/cli/packages/util/check-for-update.go @@ -76,7 +76,7 @@ func getLatestTag(repoOwner string, repoName string) (string, error) { } // Filter tags with prefix "infisical-cli/" - prefix := "infisical-cli/" + prefix := "infisical-cli/v" var validTags []string for _, tag := range tags { if strings.HasPrefix(tag.Name, prefix) { From 3dd21374e73eb2a34041e015a5da06af0cdcabca Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Sun, 30 Apr 2023 11:40:19 -0400 Subject: [PATCH 7/9] update go releaser distribution --- .github/workflows/release_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml index 82fac8f2a..f728d52bd 100644 --- a/.github/workflows/release_build.yml +++ b/.github/workflows/release_build.yml @@ -41,7 +41,7 @@ jobs: git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target - uses: goreleaser/goreleaser-action@v4 with: - distribution: pro + distribution: goreleaser-pro version: latest args: release --clean env: From 82d3971d9e1e097430486ba767dc8a2baaa57805 Mon Sep 17 00:00:00 2001 From: vmatsiiako <78047717+vmatsiiako@users.noreply.github.com> Date: Sun, 30 Apr 2023 09:07:25 -0700 Subject: [PATCH 8/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d6d2fb786..dddefb54b 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ And much more. ## Getting started -| Check out the [Quickstarts](https://infisical.com/docs/getting-started/introduction) Guide +Check out the [Quickstart](https://infisical.com/docs/getting-started/introduction) Guides ### Use Infisical Cloud From da07d71e157cf60857faee36f913baeb36a109aa Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Sun, 30 Apr 2023 12:42:10 -0400 Subject: [PATCH 9/9] remove completions --- .goreleaser.yaml | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 3ebb3fc3f..2d4bdea5b 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -98,12 +98,12 @@ brews: folder: Formula homepage: "https://infisical.com" description: "The official Infisical CLI" - install: |- - bin.install "infisical" - bash_completion.install "completions/infisical.bash" => "infisical" - zsh_completion.install "completions/infisical.zsh" => "_infisical" - fish_completion.install "completions/infisical.fish" - man1.install "manpages/infisical.1.gz" + # install: |- + # bin.install "infisical" + # bash_completion.install "completions/infisical.bash" => "infisical" + # zsh_completion.install "completions/infisical.zsh" => "_infisical" + # fish_completion.install "completions/infisical.fish" + # man1.install "manpages/infisical.1.gz" nfpms: - id: infisical @@ -121,15 +121,15 @@ nfpms: - apk - archlinux bindir: /usr/bin - contents: - - src: ./completions/infisical.bash - dst: /etc/bash_completion.d/infisical - - src: ./completions/infisical.fish - dst: /usr/share/fish/vendor_completions.d/infisical.fish - - src: ./completions/infisical.zsh - dst: /usr/share/zsh/site-functions/_infisical - - src: ./manpages/infisical.1.gz - dst: /usr/share/man/man1/infisical.1.gz + # contents: + # - src: ./completions/infisical.bash + # dst: /etc/bash_completion.d/infisical + # - src: ./completions/infisical.fish + # dst: /usr/share/fish/vendor_completions.d/infisical.fish + # - src: ./completions/infisical.zsh + # dst: /usr/share/zsh/site-functions/_infisical + # - src: ./manpages/infisical.1.gz + # dst: /usr/share/man/man1/infisical.1.gz scoop: bucket: @@ -156,15 +156,6 @@ aurs: install -Dm755 "./infisical" "${pkgdir}/usr/bin/infisical" # license install -Dm644 "./LICENSE" "${pkgdir}/usr/share/licenses/infisical/LICENSE" - # completions - mkdir -p "${pkgdir}/usr/share/bash-completion/completions/" - mkdir -p "${pkgdir}/usr/share/zsh/site-functions/" - mkdir -p "${pkgdir}/usr/share/fish/vendor_completions.d/" - install -Dm644 "./completions/infisical.bash" "${pkgdir}/usr/share/bash-completion/completions/infisical" - install -Dm644 "./completions/infisical.zsh" "${pkgdir}/usr/share/zsh/site-functions/infisical" - install -Dm644 "./completions/infisical.fish" "${pkgdir}/usr/share/fish/vendor_completions.d/infisical.fish" - # man pages - install -Dm644 "./manpages/infisical.1.gz" "${pkgdir}/usr/share/man/man1/infisical.1.gz" # dockers: # - dockerfile: cli/docker/Dockerfile