Merge branch 'master' into jfrogGH-621-bulk-import

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,7 +3,7 @@ name: Bug report
 about: Create a report to help us improve
 title: ''
 labels: bug
-assignees: danielmkn
+assignees: alexhung
 
 ---
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,8 +2,8 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: ''
-assignees: ''
+labels: enhancement
+assignees: alexhung
 
 ---
 

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
       -
         name: Import GPG key
         id: import_gpg

.goreleaser.yml

@@ -14,7 +14,7 @@ builds:
   flags:
     - -trimpath
   ldflags:
-    - '-s -w -X github.com/jfrog/terraform-provider-artifactory/v6/pkg/artifactory/provider.Version={{.Version}}'
+    - '-s -w -X github.com/jfrog/terraform-provider-artifactory/v{{.Major}}/pkg/artifactory/provider.Version={{.Version}}'
   goos:
     - freebsd
     - windows

.jfrog-pipelines/TFproviderTest.yml

@@ -28,7 +28,7 @@ pipelines:
               auto:
                 language: go
                 versions:
-                  - "1.19"
+                  - "1.21"
           requiresApproval:
             approvers:
               - alexh

CHANGELOG.md

@@ -1,3 +1,63 @@
+## 9.9.1 (Dec 4, 2023). Tested on Artifactory 7.71.5 with Terraform CLI v1.6.5
+
+BUG FIX:
+
+* Fix incorrect use of empty error message when API fails PR: [#850](https://github.com/jfrog/terraform-provider-artifactory/pull/850) Issue: [#849](https://github.com/jfrog/terraform-provider-artifactory/issues/849)
+* resource/artifactory_global_environment: Fix incorrect environment from Artifactroy being matched and triggers a state drift. PR: [#851](https://github.com/jfrog/terraform-provider-artifactory/pull/851)
+
+## 9.9.0 (Nov 17, 2023). Tested on Artifactory 7.71.4 with Terraform CLI v1.6.4
+
+IMPROVEMENTS:
+
+* resource/artifactory_federated_*_repository: Add `proxy` and `disable_proxy` attributes. PR: [#848](https://github.com/jfrog/terraform-provider-artifactory/pull/848) Issue: [#838](https://github.com/jfrog/terraform-provider-artifactory/issues/838)
+
+## 9.8.0 (Nov 8, 2023). Tested on Artifactory 7.71.4 with Terraform CLI v1.6.3
+
+IMPROVEMENTS:
+
+* resource/artifactory_remote_docker_repository, resource/artifactory_remote_maven_repository, resource/artifactory_npm_docker_repository,resource/artifactory_remote_pypi_repository: Add `curated` attribute to support enabling the repository resource for Curation Service. Issue: [#831](https://github.com/jfrog/terraform-provider-artifactory/issues/831) PR: [#844](https://github.com/jfrog/terraform-provider-artifactory/pull/844)
+* resource/artifactory_pull_replication: Add missing deprecation message to documentation. PR: [#843](https://github.com/jfrog/terraform-provider-artifactory/pull/843)
+
+## 9.7.4 (Nov 6, 2023). Tested on Artifactory 7.71.3 with Terraform CLI v1.6.3
+
+IMPROVEMENTS:
+
+* resource/artifactory_permission_target: Revert back to using Terraform SDKv2 due to unresolved performance issue from Terraform Framework. Issue: [#757](https://github.com/jfrog/terraform-provider-artifactory/issues/757) and [#805](https://github.com/jfrog/terraform-provider-artifactory/issues/805) PR: [#842](https://github.com/jfrog/terraform-provider-artifactory/pull/842)
+
+## 9.7.3 (Nov 2, 2023). Tested on Artifactory 7.71.3 with Terraform CLI v1.6.3
+
+SECURITY:
+
+* provider: Bump google.golang.org/grpc from 1.56.1 to 1.56.3 PR: [#836](https://github.com/jfrog/terraform-provider-artifactory/pull/836)
+
+IMPROVEMENTS:
+
+* resource/artifactory_federated_*_repository: Add configuration synchronization when creating or updating resource. Issue: [#825](https://github.com/jfrog/terraform-provider-artifactory/issues/825)
+* provider: Add warning message for Terraform CLI version <1.0.0 deprecation
+
+PR: [#840](https://github.com/jfrog/terraform-provider-artifactory/pull/840)
+
+NOTES:
+
+We will be moving to [Terraform Protocol v6](https://developer.hashicorp.com/terraform/plugin/terraform-plugin-protocol#protocol-version-6) in **Q1 2024**. This means only Terraform CLI version 1.0 and later will be supported.
+
+## 9.7.2 (Oct 19, 2023). Tested on Artifactory 7.71.3 with Terraform CLI v1.6.2
+
+BUG FIX:
+
+* provider: Fix schema differences between SDKv2 and Framework providers. PR: [#834](https://github.com/jfrog/terraform-provider-artifactory/pull/834) Issue: [#833](https://github.com/jfrog/terraform-provider-artifactory/issues/833)
+
+## 9.7.1 (Oct 19, 2023). Tested on Artifactory 7.68.14 with Terraform CLI v1.6.2
+
+IMPROVEMENTS:
+
+* provider:
+  * Remove conflict validation between `access_token` and `api_key` attributes. If set, `access_token` will take precedent over `api_key`.
+  * Update documentation to align with actual provider behavior.
+
+PR: [#832](https://github.com/jfrog/terraform-provider-artifactory/pull/832)
+Issue: [#663](https://github.com/jfrog/terraform-provider-artifactory/issues/663)
+
 ## 9.7.0 (Oct 18, 2023). Tested on Artifactory 7.68.14 with Terraform CLI v1.6.1
 
 IMPROVEMENTS:
@@ -224,7 +284,7 @@ IMPROVEMENTS:
 
 * resource/artifactory_permission_target is migrated to Plugin Framework, improved attribute validation.
 
-  PR: [#742](https://github.com/jfrog/terraform-provider-artifactory/pull/42)
+PR: [#742](https://github.com/jfrog/terraform-provider-artifactory/pull/742)
 
 ## 7.11.2 (May 30, 2023). Tested on Artifactory 7.59.9
 

GNUmakefile

@@ -9,9 +9,10 @@ GORELEASER_ARCH=${TARGET_ARCH}_$(shell go env GOAMD64)
 endif
 PKG_NAME=pkg/artifactory
 # if this path ever changes, you need to also update the 'ldflags' value in .goreleaser.yml
-PKG_VERSION_PATH=github.com/jfrog/terraform-provider-${PRODUCT}/${PKG_NAME}
 PROVIDER_VERSION?=$(shell git describe --tags --abbrev=0 | sed  -n 's/v\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1.\2.\3/p')
+PROVIDER_MAJOR_VERSION?=$(shell echo ${PROVIDER_VERSION}| awk -F '.' '{print $$1}' )
 NEXT_PROVIDER_VERSION := $(shell echo ${PROVIDER_VERSION}| awk -F '.' '{print $$1 "." $$2 "." $$3 +1 }' )
+PKG_VERSION_PATH=github.com/jfrog/terraform-provider-${PRODUCT}/v${PROVIDER_MAJOR_VERSION}/${PKG_NAME}
 BUILD_PATH=terraform.d/plugins/registry.terraform.io/jfrog/${PRODUCT}/${NEXT_PROVIDER_VERSION}/${TARGET_ARCH}
 SONAR_SCANNER_VERSION?=4.7.0.2747
 SONAR_SCANNER_HOME?=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-macosx

README.md

@@ -9,14 +9,24 @@
 
 ## Releases
 
-Current provider major release: **7.x**
+Current provider major release: **9.x**
 
 See [CHANGELOG.md](CHANGELOG.md) for full details
 
 ## Versions
 
-We maintain two major versions of Terraform Provider - 6.x and 7.x. Version 6.x is compatible with the Artifactory versions 7.49.x and below,
-version 7.x is only compatible with Artifactory 7.50.x and above due to changes in the projects functionality.
+Version 6.x is compatible with the Artifactory versions 7.49.x and below.
+
+Version 7.x and 8.x is only compatible with Artifactory between 7.50.x and 7.67.x due to changes in the projects functionality.
+
+Version 9.x is the latest major version and is compatible with latest Artifactory versions (>=7.68.7 (self-hosted) and >=7.67.0 (cloud)).
+
+## Terraform CLI version support
+
+Current version support [Terraform Protocol v5](https://developer.hashicorp.com/terraform/plugin/terraform-plugin-protocol#protocol-version-5) which mean Terraform CLI version 0.12 and later. 
+
+> [!WARNING]
+> We will be moving to [Terraform Protocol v6](https://developer.hashicorp.com/terraform/plugin/terraform-plugin-protocol#protocol-version-6) in **Q1 2024**. This means only Terraform CLI version 1.0 and later will be supported.
 
 ## Quick Start
 

docs/data-sources/federated_alpine_repository.md

@@ -27,3 +27,5 @@ The following attributes are supported, along with the [list of attributes from
     * `url` - Full URL to ending with the repository name.
     * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
        status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_bower_repository.md

@@ -28,3 +28,5 @@ The following attributes are supported, along with the [common list of arguments
     * `url` - Full URL to ending with the repository name.
     * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
       status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_cargo_repository.md

@@ -28,3 +28,5 @@ The following attributes are supported, along with the [list of attributes from
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_chef_repository.md

@@ -29,3 +29,5 @@ The following attributes are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_cocoapods_repository.md

@@ -28,3 +28,5 @@ The following attributes are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_composer_repository.md

@@ -28,3 +28,5 @@ The following attributes are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_conan_repository.md

@@ -28,3 +28,5 @@ The following attribute are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_conda_repository.md

@@ -27,3 +27,5 @@ The following attribute are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_cran_repository.md

@@ -28,3 +28,5 @@ The following attributes are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_debian_repository.md

@@ -28,3 +28,5 @@ The following attributes are supported, along with the [list of attributes from
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_docker_v1_repository.md

@@ -27,3 +27,5 @@ The following attributes are supported, along with the [list of attributes from
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_docker_v2_repository.md

@@ -27,3 +27,5 @@ The following attributes are supported, along with the [list of attributes from
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_gems_repository.md

@@ -27,3 +27,5 @@ The following attribute are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_generic_repository.md

@@ -28,3 +28,5 @@ The following attribute are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_gitlfs_repository.md

@@ -28,3 +28,5 @@ The following attribute are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_go_repository.md

@@ -27,3 +27,5 @@ The following arguments are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_gradle_repository.md

@@ -27,3 +27,5 @@ The following attributes are supported, along with the [list of attributes from
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_helm_repository.md

@@ -27,3 +27,5 @@ The following attributes are supported, along with the [common list of arguments
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_ivy_repository.md

@@ -27,3 +27,5 @@ The following attributes are supported, along with the [list of attributes from
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.

docs/data-sources/federated_maven_repository.md

@@ -27,3 +27,5 @@ The following attributes are supported, along with the [list of attributes from
   * `url` - Full URL to ending with the repository name.
   * `enabled` - Represents the active state of the federated member. It is supported to change the enabled
     status of my own member. The config will be updated on the other federated members automatically.
+* `proxy` - Proxy key from Artifactory Proxies settings.
+* `disable_proxy` - When set to `true`, the proxy is disabled, and not returned in the API response body. If there is a default proxy set for the Artifactory instance, it will be ignored, too.