Skip to content

Add support for new field 'kmsKeyID' #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matancev merged 2 commits into from
Mar 27, 2025
Merged

Add support for new field 'kmsKeyID' #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec8211b
Add support for new field 'kmsKeyID'
Mar 6, 2025
ceb2ed5
Simplify getting 'kmsKeyID' parameter
Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 15 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ go 1.21

require (
github.com/container-storage-interface/spec v1.8.0
github.com/google/uuid v1.4.0
github.com/google/uuid v1.6.0
github.com/kubernetes-csi/csi-test/v4 v4.4.0
github.com/mitchellh/go-testing-interface v1.14.1
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.30.0
github.com/stretchr/testify v1.8.4
github.com/yandex-cloud/go-genproto v0.0.0-20231204110853-8db1d6a6f340
github.com/yandex-cloud/go-sdk v0.0.0-20231204111359-25f2607c41ac
golang.org/x/net v0.19.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
github.com/stretchr/testify v1.9.0
github.com/yandex-cloud/go-genproto v0.0.0-20250304111827-f558b88ff434
github.com/yandex-cloud/go-sdk v0.0.0-20250304120247-c2605c41f59f
golang.org/x/net v0.28.0
google.golang.org/grpc v1.66.2
google.golang.org/protobuf v1.34.2
k8s.io/apimachinery v0.28.4
k8s.io/klog v1.0.0
k8s.io/kubernetes v1.28.4
Expand All @@ -28,21 +28,21 @@ require (
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/opencontainers/selinux v1.10.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
github.com/stretchr/objx v0.5.2 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
82 changes: 32 additions & 50 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions pkg/diskapi/diskapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ type CreateDiskRequest struct {
Size int64
SnapshotID string
DiskPlacementPolicy *DiskPlacementPolicy
KMSKeyID string
}

type DiskPlacementPolicy struct {
Expand Down
2 changes: 2 additions & 0 deletions pkg/diskapi/public/public.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
ycsdk "github.com/yandex-cloud/go-sdk"

"github.com/yandex-cloud/yc-csi-driver/pkg/diskapi"

"golang.org/x/net/context"
Expand Down Expand Up @@ -83,6 +84,7 @@ func (d *publicDiskAPI) CreateDisk(ctx context.Context, req *diskapi.CreateDiskR
Labels: labels,
Size: req.Size,
DiskPlacementPolicy: convertDiskPlacementPolicyToComputeAPI(req.DiskPlacementPolicy),
KmsKeyId: req.KMSKeyID,
},
),
)
Expand Down
13 changes: 9 additions & 4 deletions pkg/diskapi/public/public_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (

"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
ycsdk "github.com/yandex-cloud/go-sdk"

"github.com/yandex-cloud/yc-csi-driver/pkg/diskapi"
"github.com/yandex-cloud/yc-csi-driver/pkg/inflight"
"github.com/yandex-cloud/yc-csi-driver/pkg/services"
Expand All @@ -43,6 +44,7 @@ const (
diskName = "NewVolume"
diskTypeID = "mytype"
instanceID = "NewInstance"
kmsKeyID = "kms-key-id"
defaultDiskSizeBytes = 4 * 1024 * 1024 * 1024
)

Expand All @@ -57,6 +59,7 @@ type testResources struct {
diskName string
testData *testData
defaultDiskSizeBytes int64
kmsKeyID string
}

type controllerTest struct {
Expand All @@ -73,10 +76,11 @@ func TestCreateDisk(t *testing.T) {
disk, err := test.diskapi.CreateDisk(
context.Background(),
&diskapi.CreateDiskRequest{
Name: test.cloudRes.diskName,
ZoneID: test.cloudRes.zoneID,
TypeID: test.cloudRes.diskTypeID,
Size: test.cloudRes.defaultDiskSizeBytes,
Name: test.cloudRes.diskName,
ZoneID: test.cloudRes.zoneID,
TypeID: test.cloudRes.diskTypeID,
Size: test.cloudRes.defaultDiskSizeBytes,
KMSKeyID: test.cloudRes.kmsKeyID,
})
require.NoError(t, err)
assert.Equal(t, disk.Name, test.cloudRes.diskName)
Expand Down Expand Up @@ -337,6 +341,7 @@ func initializeTest(t *testing.T) *controllerTest {
diskTypeID: diskTypeID,
diskName: diskName,
defaultDiskSizeBytes: defaultDiskSizeBytes,
kmsKeyID: kmsKeyID,
testData: &testData{disk: []*compute.Disk{}, instance: []*compute.Instance{}},
},
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/diskapi/public/testutil_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (

"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
pubOperation "github.com/yandex-cloud/go-genproto/yandex/cloud/operation"

"github.com/yandex-cloud/yc-csi-driver/pkg/testutil/pubapimock"
)

Expand All @@ -48,6 +49,9 @@ func diskCreateMock(api *pubapimock.API, folderID string, testData *testData) {
TypeId: req.GetTypeId(),
ZoneId: req.GetZoneId(),
Size: req.GetSize(),
KmsKey: &compute.KMSKey{
KeyId: req.GetKmsKeyId(),
},
}
testData.disk = append(testData.disk, disk)
return successOperation(disk)
Expand Down
2 changes: 2 additions & 0 deletions pkg/services/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ const (

DiskPlacementGroupIDKey = "diskPlacementGroupId"
DiskPlacementGroupPartitionKey = "diskPlacementGroupPartition"

KMSKeyIDKey = "kmsKeyId"
)

var (
Expand Down
2 changes: 2 additions & 0 deletions pkg/services/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,8 @@ func (c *controller) createNewVolume(

diskAPIRequest.DiskPlacementPolicy = diskPlacementPolicy

diskAPIRequest.KMSKeyID = parameters[services.KMSKeyIDKey]

disk, err := c.diskAPI.CreateDisk(
ctx,
diskAPIRequest,
Expand Down
177 changes: 177 additions & 0 deletions pkg/testutil/pubapimock/mock/computemocks/instance_service_server.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading