From 7e08f5780609416a3bea69bd02fb6b811bf46452 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:24:51 +0000 Subject: [PATCH 1/2] Bump github.com/jfrog/terraform-provider-shared from 1.21.3 to 1.22.0 Bumps [github.com/jfrog/terraform-provider-shared](https://github.com/jfrog/terraform-provider-shared) from 1.21.3 to 1.22.0. - [Changelog](https://github.com/jfrog/terraform-provider-shared/blob/main/CHANGELOG.md) - [Commits](https://github.com/jfrog/terraform-provider-shared/compare/v1.21.3...v1.22.0) --- updated-dependencies: - dependency-name: github.com/jfrog/terraform-provider-shared dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9b492cb..33c19ec 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/hashicorp/terraform-plugin-go v0.22.1 github.com/hashicorp/terraform-plugin-log v0.9.0 github.com/hashicorp/terraform-plugin-testing v1.7.0 - github.com/jfrog/terraform-provider-shared v1.21.3 + github.com/jfrog/terraform-provider-shared v1.22.0 github.com/samber/lo v1.39.0 ) diff --git a/go.sum b/go.sum index 764f747..857e04a 100644 --- a/go.sum +++ b/go.sum @@ -124,8 +124,8 @@ github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= 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/jfrog/terraform-provider-shared v1.21.3 h1:zAE7mWTZ0WUjr7d7dC0WOPNU9xpwuc7mh2RB+T7XNP8= -github.com/jfrog/terraform-provider-shared v1.21.3/go.mod h1:xwhh2ugF0XwEd8wlalqC54ibJBmSlmLLhA5l04gBJsU= +github.com/jfrog/terraform-provider-shared v1.22.0 h1:6nmAltCTz/dvPDprK4iYFB9huwiJDiTHWOkOoVqQTgg= +github.com/jfrog/terraform-provider-shared v1.22.0/go.mod h1:rIiQMiefaHAlsh+vSCX+7W4tilJcqgQZLGwlHRqLMSg= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= From 2decc158495dbc8423927080eb4710b9914776a5 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Tue, 12 Mar 2024 09:44:19 -0700 Subject: [PATCH 2/2] Fix acceptance destroy test --- pkg/platform/resource_permission_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/platform/resource_permission_test.go b/pkg/platform/resource_permission_test.go index dc23626..835e473 100644 --- a/pkg/platform/resource_permission_test.go +++ b/pkg/platform/resource_permission_test.go @@ -317,12 +317,13 @@ func testAccCheckPermissionDestroy(id string) func(*terraform.State) error { Get(url) if err != nil { - if resp != nil && resp.StatusCode() == http.StatusNotFound { - return nil - } return err } + if resp != nil && resp.StatusCode() == http.StatusNotFound { + return nil + } + return fmt.Errorf("error: Permission %s still exists", rs.Primary.Attributes["name"]) } }