rebase: Bump github.com/IBM/keyprotect-go-client from 0.9.2 to 0.10.0

Bumps [github.com/IBM/keyprotect-go-client](https://github.com/IBM/keyprotect-go-client) from 0.9.2 to 0.10.0.
- [Release notes](https://github.com/IBM/keyprotect-go-client/releases)
- [Changelog](https://github.com/IBM/keyprotect-go-client/blob/master/CHANGELOG.md)
- [Commits](https://github.com/IBM/keyprotect-go-client/compare/v0.9.2...v0.10.0)

---
updated-dependencies:
- dependency-name: github.com/IBM/keyprotect-go-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot] 2023-04-14 08:06:53 +00:00 committed by Madhu Rajanna
parent 09a858d51d
commit 7b44054a7e
8 changed files with 58 additions and 25 deletions

2
go.mod
View File

@ -3,7 +3,7 @@ module github.com/ceph/ceph-csi
go 1.19 go 1.19
require ( require (
github.com/IBM/keyprotect-go-client v0.9.2 github.com/IBM/keyprotect-go-client v0.10.0
github.com/aws/aws-sdk-go v1.44.220 github.com/aws/aws-sdk-go v1.44.220
github.com/aws/aws-sdk-go-v2/service/sts v1.18.6 github.com/aws/aws-sdk-go-v2/service/sts v1.18.6
github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000 github.com/ceph/ceph-csi/api v0.0.0-00010101000000-000000000000

4
go.sum
View File

@ -91,8 +91,8 @@ github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dX
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
github.com/DataDog/zstd v1.4.4/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.4/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
github.com/IBM/keyprotect-go-client v0.5.1/go.mod h1:5TwDM/4FRJq1ZOlwQL1xFahLWQ3TveR88VmL1u3njyI= github.com/IBM/keyprotect-go-client v0.5.1/go.mod h1:5TwDM/4FRJq1ZOlwQL1xFahLWQ3TveR88VmL1u3njyI=
github.com/IBM/keyprotect-go-client v0.9.2 h1:BWRIk26Zh966E4lVcpZzSJAI4H/q/iPA2I5/csKD7JU= github.com/IBM/keyprotect-go-client v0.10.0 h1:UdVOwJfyVNmL4O3Aw2eGluiEr5FpV5h8EaNVJKCtLvY=
github.com/IBM/keyprotect-go-client v0.9.2/go.mod h1:yr8h2noNgU8vcbs+vhqoXp3Lmv73PI0zAc6VMgFvWwM= github.com/IBM/keyprotect-go-client v0.10.0/go.mod h1:yr8h2noNgU8vcbs+vhqoXp3Lmv73PI0zAc6VMgFvWwM=
github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E= github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E=
github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc=
github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=

View File

@ -30,8 +30,8 @@ script:
# To enable semantic-release, uncomment these sections. # To enable semantic-release, uncomment these sections.
before_deploy: before_deploy:
- nvm install 14 - nvm install node
- npm install -g npm@6.x - npm install -g npm
- npm install @semantic-release/changelog - npm install @semantic-release/changelog
- npm install @semantic-release/exec - npm install @semantic-release/exec
- npm install @semantic-release/git - npm install @semantic-release/git

View File

@ -532,21 +532,11 @@ func (c *Client) SetInstancePolicies(ctx context.Context, policies MultiplePolic
}, },
} }
if policies.KeyCreateImportAccess.CreateRootKey { policy.PolicyData.Attributes.CreateRootKey = &policies.KeyCreateImportAccess.CreateRootKey
policy.PolicyData.Attributes.CreateRootKey = &policies.KeyCreateImportAccess.CreateRootKey policy.PolicyData.Attributes.CreateStandardKey = &policies.KeyCreateImportAccess.CreateStandardKey
} policy.PolicyData.Attributes.ImportRootKey = &policies.KeyCreateImportAccess.ImportRootKey
if policies.KeyCreateImportAccess.CreateStandardKey { policy.PolicyData.Attributes.ImportStandardKey = &policies.KeyCreateImportAccess.ImportStandardKey
policy.PolicyData.Attributes.CreateStandardKey = &policies.KeyCreateImportAccess.CreateStandardKey policy.PolicyData.Attributes.EnforceToken = &policies.KeyCreateImportAccess.EnforceToken
}
if policies.KeyCreateImportAccess.ImportRootKey {
policy.PolicyData.Attributes.ImportRootKey = &policies.KeyCreateImportAccess.ImportRootKey
}
if policies.KeyCreateImportAccess.ImportStandardKey {
policy.PolicyData.Attributes.ImportStandardKey = &policies.KeyCreateImportAccess.ImportStandardKey
}
if policies.KeyCreateImportAccess.EnforceToken {
policy.PolicyData.Attributes.EnforceToken = &policies.KeyCreateImportAccess.EnforceToken
}
resPolicies = append(resPolicies, policy) resPolicies = append(resPolicies, policy)
} }

View File

@ -400,9 +400,10 @@ type ForceOpt struct {
// ListKeyVersionsOptions struct to add the query parameters for the ListKeyVersions function // ListKeyVersionsOptions struct to add the query parameters for the ListKeyVersions function
type ListKeyVersionsOptions struct { type ListKeyVersionsOptions struct {
Limit *uint32 Limit *uint32
Offset *uint32 Offset *uint32
TotalCount *bool TotalCount *bool
AllKeyStates *bool
} }
// ListKeyVersions gets all the versions of the key resource by specifying ID of the key and/or optional parameters // ListKeyVersions gets all the versions of the key resource by specifying ID of the key and/or optional parameters
@ -427,6 +428,9 @@ func (c *Client) ListKeyVersions(ctx context.Context, idOrAlias string, listKeyV
if listKeyVersionsOptions.TotalCount != nil { if listKeyVersionsOptions.TotalCount != nil {
values.Set("totalCount", fmt.Sprint(*listKeyVersionsOptions.TotalCount)) values.Set("totalCount", fmt.Sprint(*listKeyVersionsOptions.TotalCount))
} }
if listKeyVersionsOptions.AllKeyStates != nil {
values.Set("allKeyStates", fmt.Sprint(*listKeyVersionsOptions.AllKeyStates))
}
req.URL.RawQuery = values.Encode() req.URL.RawQuery = values.Encode()
} }
@ -740,7 +744,7 @@ func (c *Client) InitiateDualAuthDelete(ctx context.Context, idOrAlias string) e
// CancelDualAuthDelete unsets the key for deletion. If a key is set for deletion, it can // CancelDualAuthDelete unsets the key for deletion. If a key is set for deletion, it can
// be prevented from getting deleted by unsetting the key for deletion. // be prevented from getting deleted by unsetting the key for deletion.
// For more information refer to the Key Protect docs in the link below: // For more information refer to the Key Protect docs in the link below:
//https://cloud.ibm.com/docs/key-protect?topic=key-protect-delete-dual-auth-keys#unset-key-deletion-api // https://cloud.ibm.com/docs/key-protect?topic=key-protect-delete-dual-auth-keys#unset-key-deletion-api
func (c *Client) CancelDualAuthDelete(ctx context.Context, idOrAlias string) error { func (c *Client) CancelDualAuthDelete(ctx context.Context, idOrAlias string) error {
_, err := c.doKeysAction(ctx, idOrAlias, "unsetKeyForDeletion", nil) _, err := c.doKeysAction(ctx, idOrAlias, "unsetKeyForDeletion", nil)
return err return err

3
vendor/github.com/openshift/api/security/v1/Makefile generated vendored Normal file
View File

@ -0,0 +1,3 @@
.PHONY: test
test:
make -C ../../tests test GINKGO_EXTRA_ARGS=--focus="security.openshift.io/v1"

View File

@ -0,0 +1,36 @@
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
name: "[Stable] SecurityContextConstraints"
crd: 0000_03_security-openshift_01_scc.crd.yaml
tests:
onCreate:
- name: Should be able to create a minimal SecurityContextConstraints
initial: |
apiVersion: security.openshift.io/v1
kind: SecurityContextConstraints
allowHostDirVolumePlugin: false
allowHostIPC: false
allowHostNetwork: false
allowHostPID: false
allowHostPorts: false
allowPrivilegedContainer: false
allowedCapabilities: []
defaultAddCapabilities: []
priority: 0
readOnlyRootFilesystem: false
requiredDropCapabilities: []
volumes: []
expected: |
apiVersion: security.openshift.io/v1
kind: SecurityContextConstraints
allowHostDirVolumePlugin: false
allowHostIPC: false
allowHostNetwork: false
allowHostPID: false
allowHostPorts: false
allowPrivilegedContainer: false
allowedCapabilities: []
defaultAddCapabilities: []
priority: 0
readOnlyRootFilesystem: false
requiredDropCapabilities: []
volumes: []

2
vendor/modules.txt vendored
View File

@ -1,4 +1,4 @@
# github.com/IBM/keyprotect-go-client v0.9.2 # github.com/IBM/keyprotect-go-client v0.10.0
## explicit; go 1.15 ## explicit; go 1.15
github.com/IBM/keyprotect-go-client github.com/IBM/keyprotect-go-client
github.com/IBM/keyprotect-go-client/iam github.com/IBM/keyprotect-go-client/iam