v0.7.0 release (#6)

Upgrade cbs_array_azure to 6.3.5 and cbs_array_aws to 6.2.13,
mark jit_approval deprecated in favor of jit_approval_group_object_ids

Co-authored-by: Tomas Simacek <tsimacek@pruestorage.com>

Author: tsimacek

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: 1.18
       -
         name: Import GPG key
         id: import_gpg

.goreleaser.yml

@@ -2,6 +2,9 @@
 
 # Visit https://goreleaser.com for documentation on how to customize this
 # behavior.
+
+dist: .build/goreleaser-dist
+
 before:
   hooks:
     # this is just an example and not a requirement for provider building/publishing

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.7.0 (Oct 19, 2022)
+
+* Update Purity version of cbs_array_azure to 6.3.5
+* Update Purity version of cbs_array_aws to 6.2.13
+* Add support for JIT approvals using `jit_approval_group_object_ids` parameter, refer to the [documentation](docs/resources/array_azure.md)
+* Marking `jit_approval` as Deprecated, will be removed in future major release
+
 ## 0.6.0 (Aug 3, 2021)
 
 * Update Purity version of cbs_array_azure from 6.1.7 to 6.1.8

Makefile

@@ -1,12 +1,15 @@
 DEV_PKGDIR := $(HOME)/.terraform.d/plugins/terraform.purestorage.com/flasharray/cbs/
 DEV_GOBIN := $(DEV_PKGDIR)/99.99/linux_amd64/
-SRC_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+export SRC_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 SHELL=/bin/bash -eEuo pipefail # Set sane shell options
 MAKEFLAGS += -j4
 TMPBIN=/tmp/bin
 TEST_GPG_FINGERPRINT=47F12A8402BBC3906D7C3FAB78C24746203D8F4E
 export GNUPGHOME := /tmp/gnupg
 export PATH := $(TMPBIN):$(PATH)
+export PS_HTTP_TRACE_LOGGING := 1
+
+-include */Makefile.mk
 
 default: build
 
@@ -15,11 +18,10 @@ setup-basic:
 
 
 setup-goreleaser:
-	@curl -sfLO https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh
-	@bash goreleaser.sh -b $(TMPBIN) &> /dev/null
-	@rm goreleaser.sh
-# Replace with just this after go 1.16:
-# @GOBIN=$(TMPBIN) go install github.com/goreleaser/goreleaser@latest
+	@curl -sfLO https://github.com/goreleaser/goreleaser/releases/download/v1.9.2/goreleaser_Linux_x86_64.tar.gz
+	@mkdir -p $(TMPBIN)
+	@tar -C $(TMPBIN) -xf goreleaser_Linux_x86_64.tar.gz
+	@rm goreleaser_Linux_x86_64.tar.gz
 
 # CI="" for goreleaser will prevent extra control characters from cluttering
 # the logs.  See https://github.com/goreleaser/goreleaser/blob/b43a2e95ec03261a847fdf9239100d9d36adc60c/cmd/root.go#L15
@@ -50,25 +52,13 @@ install-dev-clean:
 	@rm -rvf $(DEV_PKGDIR)
 
 
-# This part just helps reduce noise, we
-
-test-everything-with-mocks: setup-basic
-	@set -a; . testing/mock.env; TF_LOG=TRACE TF_LOG_PATH="$(SRC_DIR)/.build-logs/terraform" go test --tags mock ./... -v -timeout 120m \
-	2>&1 | tee .build-logs/acc-mock  | grep -vE '^=== RUN|^--- PASS:|^--- SKIP:|^=== PAUSE|^=== CONT|^PASS|^ok|\[no test files\]'
-
 # The redirections and tee/grep stuff above is to help reduce console noise, we filter out all of the nominal messages, so its easier to see any errors
 # the full unfiltered log is in .build-logs/acc-mock
 
 test-vet:
 	@go vet ./cbs
 	@go vet -tags mock ./cbs
 
-# Tests that should run on each pull request
-test-pull-request: test-vet test-everything-with-mocks test-goreleaser-release test-goreleaser-check
-
-reset-mock-db:
-	@rm -v .build/test.db
-
 tidy:
 	@go get -u
 	@go mod tidy -v

auth/bootstrap_impl.go

@@ -0,0 +1,33 @@
+//go:build !mock
+
+/*
+
+	Copyright 2021, Pure Storage Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+
+*/
+
+package auth
+
+import "context"
+
+func (b *bootstrapService) GenerateSecretPayload(ctx context.Context, host string, pureuserPrivateKey []byte) ([]byte, error) {
+	return generateSecretPayloadReal(ctx, host, pureuserPrivateKey)
+}
+
+type bootstrapService struct{}
+
+func NewBootstrapService() Bootstrapper {
+	return &bootstrapService{}
+}

auth/bootstrap_interface.go

@@ -18,8 +18,10 @@
 
 package auth
 
+import "context"
+
 type Bootstrapper interface {
-	GenerateSecretPayload(host string, pureuserPrivateKey []byte) ([]byte, error)
+	GenerateSecretPayload(ctx context.Context, host string, pureuserPrivateKey []byte) ([]byte, error)
 }
 
 type SecretPayload struct {

auth/mock_bootstrap.go renamed to auth/bootstrap_mock.go

@@ -1,4 +1,4 @@
-// +build mock
+//go:build mock
 
 /*
 
@@ -25,6 +25,7 @@
 package auth
 
 import (
+	"context"
 	"encoding/json"
 )
 
@@ -34,7 +35,7 @@ func NewBootstrapService() Bootstrapper {
 
 type mockBootstrapService struct{}
 
-func (b *mockBootstrapService) GenerateSecretPayload(host string, pureuserPrivateKey []byte) ([]byte, error) {
+func (b *mockBootstrapService) GenerateSecretPayload(ctx context.Context, host string, pureuserPrivateKey []byte) ([]byte, error) {
 	mockPayload := SecretPayload{
 		UserName:       "mockUser",
 		Issuer:         "mockIssuer",