Skip to content

Commit

Permalink
Merge pull request #130 from maxlaverse/upgrade_cli
Browse files Browse the repository at this point in the history
upgrade CLI version + test commands
  • Loading branch information
maxlaverse authored Apr 20, 2024
2 parents 0aeb96a + 00f38f4 commit 2f6c3cb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ jobs:
env:
ADMIN_TOKEN: test1234
I_REALLY_WANT_VOLATILE_STORAGE: "true"
DISABLE_ICON_DOWNLOAD: "false"
LOGIN_RATELIMIT_SECONDS: "1"
LOGIN_RATELIMIT_MAX_BURST: "1000000"
ADMIN_RATELIMIT_SECONDS: "1"
Expand All @@ -49,15 +50,15 @@ jobs:
- id: binaries
run: |
echo "LOCAL_BINARIES=$GITHUB_WORKSPACE/bin" >> $GITHUB_OUTPUT
echo "BWCLI_VERSION=2023.1.0" >> $GITHUB_OUTPUT
echo "BWCLI_VERSION=2023.2.0" >> $GITHUB_OUTPUT
- name: Check out repository code
uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '>=1.22.2'
go-version: '>=1.22.0'

# Cache go build cache, used to speedup go test
- name: Go Build Cache
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ This project is not associated with the Bitwarden project nor 8bit Solutions LLC

## Supported Versions
The plugin has been tested and built with the following components:
- [Terraform] v1.5.2
- [Bitwarden CLI] v2023.7.0
- [Go] 1.22.2 (for development)
- [Terraform] v1.6.1
- [Bitwarden CLI] v2023.2.0
- [Go] 1.22.0 (for development)
- [Docker] 23.0.5 (for development)

The provider likely works with older versions but those haven't been tested.
Expand Down Expand Up @@ -141,11 +141,13 @@ In order to run the full suite of Acceptance tests, start a Vaultwarden server:
```sh
$ docker run -ti \
-e I_REALLY_WANT_VOLATILE_STORAGE=true \
-e DISABLE_ICON_DOWNLOAD=false \
-e ADMIN_TOKEN=test1234 \
-e LOGIN_RATELIMIT_SECONDS=1 \
-e LOGIN_RATELIMIT_MAX_BURST=1000000 \
-e ADMIN_RATELIMIT_SECONDS=1 \
-e ADMIN_RATELIMIT_MAX_BURST=1000000 \
--mount type=tmpfs,destination=/data \
-p 8080:80 vaultwarden/server
```

Expand Down
3 changes: 2 additions & 1 deletion internal/provider/provider_utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ func ensureVaultwardenConfigured(t *testing.T) {
t.Fatal(err)
}
}
testOrganizationID, err = webapiClient.CreateOrganization(fmt.Sprintf("org-%d", time.Now().Unix()), fmt.Sprintf("coll-%d", time.Now().Unix()), testEmail)
dateTimeStr := fmt.Sprintf("%d-%d-%d", time.Now().Hour(), time.Now().Minute(), time.Now().Second())
testOrganizationID, err = webapiClient.CreateOrganization(fmt.Sprintf("org-%s", dateTimeStr), fmt.Sprintf("coll-%s", dateTimeStr), testEmail)
if err != nil {
t.Fatal(err)
}
Expand Down

0 comments on commit 2f6c3cb

Please sign in to comment.