diff --git a/CHANGELOG.md b/CHANGELOG.md index f60187d0..12c56336 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## 1.1.4 (May 24, 2022). Tested on Artifactory 7.38.10 and Xray 3.49.0 + +BUG FIX: + +* add 'Commercial' licence to the list of allowed licenses. + [GH-52](https://github.com/jfrog/terraform-provider-xray/pull/52) + + ## 1.1.3 (May 12, 2022). Tested on Artifactory 7.38.8 and Xray 3.48.2 * minor version bump to force release due to build failure diff --git a/go.mod b/go.mod index ca73dbfb..8591eee3 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/jfrog/terraform-provider-xray require ( github.com/go-resty/resty/v2 v2.7.0 github.com/hashicorp/terraform-plugin-sdk/v2 v2.14.0 - github.com/jfrog/terraform-provider-shared v0.5.0 + github.com/jfrog/terraform-provider-shared v0.7.0 ) require ( diff --git a/go.sum b/go.sum index 003e806a..e3dbbaa9 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jfrog/terraform-provider-shared v0.5.0 h1:1TEHe3ZkLSNBcxcQ5Ba9X05WiXJpbScRR7eaeXW00CA= -github.com/jfrog/terraform-provider-shared v0.5.0/go.mod h1:2ueIlfizwfDAkL1jm3hmvYBqbMusQtHz33ZpDiPOyxA= +github.com/jfrog/terraform-provider-shared v0.7.0 h1:x8qLXyptP35KC1vLaqN2AWJC7/eMNZE2jabiBx07JSY= +github.com/jfrog/terraform-provider-shared v0.7.0/go.mod h1:2ueIlfizwfDAkL1jm3hmvYBqbMusQtHz33ZpDiPOyxA= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck= diff --git a/pkg/xray/provider.go b/pkg/xray/provider.go index 787585b4..149adc44 100644 --- a/pkg/xray/provider.go +++ b/pkg/xray/provider.go @@ -14,7 +14,7 @@ import ( // Version for some reason isn't getting updated by the linker var Version = "0.0.1" -var productId = "terraform-provider-xray/" + Version +var productId = "terraform-provider-xray/" + Version // Provider Xray provider that supports configuration via username+password or a token // Supported resources are policies and watches @@ -22,9 +22,9 @@ func Provider() *schema.Provider { p := &schema.Provider{ Schema: map[string]*schema.Schema{ "url": { - Type: schema.TypeString, - Optional: true, - DefaultFunc: schema.MultiEnvDefaultFunc([]string{"XRAY_URL", "JFROG_URL"}, "http://localhost:8081"), + Type: schema.TypeString, + Optional: true, + DefaultFunc: schema.MultiEnvDefaultFunc([]string{"XRAY_URL", "JFROG_URL"}, "http://localhost:8081"), ValidateFunc: validation.IsURLWithHTTPorHTTPS, Description: "URL of Artifactory. This can also be sourced from the `XRAY_URL` or `JFROG_URL` environment variable. Default to 'http://localhost:8081' if not set.", }, @@ -78,7 +78,7 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, terraformVer return nil, diag.FromErr(err) } - licenseErr := util.CheckArtifactoryLicense(restyBase) + licenseErr := util.CheckArtifactoryLicense(restyBase, "Enterprise", "Commercial") if licenseErr != nil { return nil, licenseErr }