diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index b6ba01fbd..acde4f878 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -242,7 +242,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.2) + rexml (3.3.3) strscan rouge (3.30.0) rubyzip (2.3.2) diff --git a/go.mod b/go.mod index 030301cd4..b8249ce09 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 github.com/hashicorp/go-version v1.7.0 - github.com/hashicorp/hc-install v0.7.0 + github.com/hashicorp/hc-install v0.8.0 github.com/hashicorp/terraform-exec v0.21.0 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 github.com/lestrrat-go/jwx v1.2.30 @@ -64,6 +64,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/gorilla/css v1.0.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/hashicorp/terraform-json v0.22.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/klauspost/compress v1.17.7 // indirect @@ -92,7 +93,7 @@ require ( github.com/yuin/goldmark-emoji v1.0.2 // indirect github.com/zclconf/go-cty v1.14.4 // indirect golang.org/x/crypto v0.25.0 // indirect - golang.org/x/mod v0.17.0 // indirect + golang.org/x/mod v0.19.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 5c150f701..73a73fd95 100644 --- a/go.sum +++ b/go.sum @@ -98,10 +98,14 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= +github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/hc-install v0.7.0 h1:Uu9edVqjKQxxuD28mR5TikkKDd/p55S8vzPC1659aBk= -github.com/hashicorp/hc-install v0.7.0/go.mod h1:ELmmzZlGnEcqoUMKUuykHaPCIR1sYLYX+KSggWSKZuA= +github.com/hashicorp/hc-install v0.8.0 h1:LdpZeXkZYMQhoKPCecJHlKvUkQFixN/nvyR1CdfOLjI= +github.com/hashicorp/hc-install v0.8.0/go.mod h1:+MwJYjDfCruSD/udvBmRB22Nlkwwkwf5sAB6uTIhSaU= github.com/hashicorp/terraform-exec v0.21.0 h1:uNkLAe95ey5Uux6KJdua6+cv8asgILFVWkd/RG0D2XQ= github.com/hashicorp/terraform-exec v0.21.0/go.mod h1:1PPeMYou+KDUSSeRE9szMZ/oHf4fYUmB923Wzbq1ICg= github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7orfb5Ltvec= @@ -247,8 +251,8 @@ golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAb golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= diff --git a/test/integration/custom-domains-test-cases.yaml b/test/integration/custom-domains-test-cases.yaml index 42e48e88d..142c74742 100644 --- a/test/integration/custom-domains-test-cases.yaml +++ b/test/integration/custom-domains-test-cases.yaml @@ -18,21 +18,21 @@ tests: exactly: "[]" 003 - create domain with minimal flags: - command: auth0 domains create --domain "custom-domain.com" --no-input + command: auth0 domains create --domain "custom-domains.com" --no-input exit-code: 0 stdout: contains: - "ID cd_" - - "DOMAIN custom-domain.com" + - "DOMAIN custom-domains.com" - "STATUS pending_verification" - "PROVISIONING TYPE auth0_managed_certs" 004 - unsuccessfully create domain with same name: - command: auth0 domains create --domain "custom-domain.com" --no-input + command: auth0 domains create --domain "custom-domains.com" --no-input exit-code: 1 stderr: contains: - - "Failed to create custom domain \"custom-domain.com\": 409 Conflict: The specified custom domain already exists" + - "Failed to create custom domain \"custom-domains.com\": 409 Conflict: The specified custom domain already exists" 005 - show domain: command: auth0 domains show $(./test/integration/scripts/get-custom-domain-id.sh) --no-input @@ -40,7 +40,7 @@ tests: stdout: contains: - "ID cd_" - - "DOMAIN custom-domain.com" + - "DOMAIN custom-domains.com" - "STATUS pending_verification" - "PROVISIONING TYPE auth0_managed_certs" @@ -50,7 +50,7 @@ tests: stdout: contains: - "ID cd_" - - "DOMAIN custom-domain.com" + - "DOMAIN custom-domains.com" - "STATUS pending_verification" - "PROVISIONING TYPE auth0_managed_certs" @@ -60,7 +60,7 @@ tests: stdout: contains: - "ID cd_" - - "DOMAIN custom-domain.com" + - "DOMAIN custom-domains.com" - "STATUS pending_verification" - "PROVISIONING TYPE auth0_managed_certs" - "TLS POLICY recommended" @@ -71,7 +71,7 @@ tests: stdout: contains: - "ID cd_" - - "DOMAIN custom-domain.com" + - "DOMAIN custom-domains.com" - "PROVISIONING TYPE auth0_managed_certs" - "TLS POLICY recommended" @@ -80,12 +80,12 @@ tests: exit-code: 0 010 - create domain with maximal flags: - command: auth0 domains create --domain "custom-domain.com" --verification txt --type self --policy recommended --no-input + command: auth0 domains create --domain "custom-domains.com" --verification txt --type self --policy recommended --no-input exit-code: 0 stdout: contains: - "ID cd_" - - "DOMAIN custom-domain.com" + - "DOMAIN custom-domains.com" - "STATUS pending_verification" - "PROVISIONING TYPE self_managed_certs" - "VERIFICATION METHOD txt" @@ -97,6 +97,6 @@ tests: exit-code: 0 stdout: contains: - - "ID DOMAIN STATUS" + - "ID DOMAIN STATUS" - "cd_" - - "custom-domain.com" + - "custom-domains.com" diff --git a/test/integration/scripts/get-custom-domain-id.sh b/test/integration/scripts/get-custom-domain-id.sh index 438d71763..a1123370d 100755 --- a/test/integration/scripts/get-custom-domain-id.sh +++ b/test/integration/scripts/get-custom-domain-id.sh @@ -1,6 +1,6 @@ #! /bin/bash -testing_domain_name="custom-domain.com" +testing_domain_name="custom-domains.com" domains=$( auth0 domains list --json --no-input ) for domain in $( printf "%s" "$domains" | jq -r '.[] | @base64' ); do @@ -17,4 +17,4 @@ for domain in $( printf "%s" "$domains" | jq -r '.[] | @base64' ); do exit 0 fi exit 1 -done \ No newline at end of file +done