Skip to content

Commit 6765ac5

Browse files
committed
Allow the plugins to be public
1 parent 1a3db16 commit 6765ac5

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

pkg/plugin/plugin_clients.go

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ import (
3030
"github.com/aws/aws-sdk-go-v2/service/sagemaker"
3131
)
3232

33-
// ec2ClientBase implements stub functionality for EC2API. It can be used
33+
// Ec2ClientBase implements stub functionality for EC2API. It can be used
3434
// by plugins that only want to customize a subset of the EC2 API calls.
3535
// Use of this struct is NOT required, plugins may return any compliant
3636
// EC2API implementation from GetEC2Client.
37-
type ec2ClientBase struct {
37+
type Ec2ClientBase struct {
3838
client *ec2.Client
3939
}
4040

41-
// init sets up the EC2 client in ec2ClientBase. Must be called first.
42-
func (b *ec2ClientBase) init(cfg aws.Config, optFns ...func(*ec2.Options)) {
41+
// init sets up the EC2 client in Ec2ClientBase. Must be called first.
42+
func (b *Ec2ClientBase) init(cfg aws.Config, optFns ...func(*ec2.Options)) {
4343
b.client = ec2.NewFromConfig(cfg, optFns...)
4444
}
4545

@@ -58,58 +58,58 @@ func (b *sageMakerClientBase) init(cfg aws.Config, optFns ...func(*sagemaker.Opt
5858

5959
// EC2API stub functions.
6060

61-
func (b *ec2ClientBase) DescribeVolumes(ctx context.Context, params *ec2.DescribeVolumesInput, optFns ...func(*ec2.Options)) (*ec2.DescribeVolumesOutput, error) {
61+
func (b *Ec2ClientBase) DescribeVolumes(ctx context.Context, params *ec2.DescribeVolumesInput, optFns ...func(*ec2.Options)) (*ec2.DescribeVolumesOutput, error) {
6262
return b.client.DescribeVolumes(ctx, params, optFns...)
6363
}
64-
func (b *ec2ClientBase) DescribeVolumeStatus(ctx context.Context, params *ec2.DescribeVolumeStatusInput, optFns ...func(options *ec2.Options)) (*ec2.DescribeVolumeStatusOutput, error) {
64+
func (b *Ec2ClientBase) DescribeVolumeStatus(ctx context.Context, params *ec2.DescribeVolumeStatusInput, optFns ...func(options *ec2.Options)) (*ec2.DescribeVolumeStatusOutput, error) {
6565
return b.client.DescribeVolumeStatus(ctx, params, optFns...)
6666
}
67-
func (b *ec2ClientBase) CreateVolume(ctx context.Context, params *ec2.CreateVolumeInput, optFns ...func(*ec2.Options)) (*ec2.CreateVolumeOutput, error) {
67+
func (b *Ec2ClientBase) CreateVolume(ctx context.Context, params *ec2.CreateVolumeInput, optFns ...func(*ec2.Options)) (*ec2.CreateVolumeOutput, error) {
6868
return b.client.CreateVolume(ctx, params, optFns...)
6969
}
70-
func (b *ec2ClientBase) CopyVolumes(ctx context.Context, params *ec2.CopyVolumesInput, optFns ...func(*ec2.Options)) (*ec2.CopyVolumesOutput, error) {
70+
func (b *Ec2ClientBase) CopyVolumes(ctx context.Context, params *ec2.CopyVolumesInput, optFns ...func(*ec2.Options)) (*ec2.CopyVolumesOutput, error) {
7171
return b.client.CopyVolumes(ctx, params, optFns...)
7272
}
73-
func (b *ec2ClientBase) DeleteVolume(ctx context.Context, params *ec2.DeleteVolumeInput, optFns ...func(*ec2.Options)) (*ec2.DeleteVolumeOutput, error) {
73+
func (b *Ec2ClientBase) DeleteVolume(ctx context.Context, params *ec2.DeleteVolumeInput, optFns ...func(*ec2.Options)) (*ec2.DeleteVolumeOutput, error) {
7474
return b.client.DeleteVolume(ctx, params, optFns...)
7575
}
76-
func (b *ec2ClientBase) AttachVolume(ctx context.Context, params *ec2.AttachVolumeInput, optFns ...func(*ec2.Options)) (*ec2.AttachVolumeOutput, error) {
76+
func (b *Ec2ClientBase) AttachVolume(ctx context.Context, params *ec2.AttachVolumeInput, optFns ...func(*ec2.Options)) (*ec2.AttachVolumeOutput, error) {
7777
return b.client.AttachVolume(ctx, params, optFns...)
7878
}
79-
func (b *ec2ClientBase) DetachVolume(ctx context.Context, params *ec2.DetachVolumeInput, optFns ...func(*ec2.Options)) (*ec2.DetachVolumeOutput, error) {
79+
func (b *Ec2ClientBase) DetachVolume(ctx context.Context, params *ec2.DetachVolumeInput, optFns ...func(*ec2.Options)) (*ec2.DetachVolumeOutput, error) {
8080
return b.client.DetachVolume(ctx, params, optFns...)
8181
}
82-
func (b *ec2ClientBase) DescribeInstances(ctx context.Context, params *ec2.DescribeInstancesInput, optFns ...func(*ec2.Options)) (*ec2.DescribeInstancesOutput, error) {
82+
func (b *Ec2ClientBase) DescribeInstances(ctx context.Context, params *ec2.DescribeInstancesInput, optFns ...func(*ec2.Options)) (*ec2.DescribeInstancesOutput, error) {
8383
return b.client.DescribeInstances(ctx, params, optFns...)
8484
}
85-
func (b *ec2ClientBase) DescribeAvailabilityZones(ctx context.Context, params *ec2.DescribeAvailabilityZonesInput, optFns ...func(*ec2.Options)) (*ec2.DescribeAvailabilityZonesOutput, error) {
85+
func (b *Ec2ClientBase) DescribeAvailabilityZones(ctx context.Context, params *ec2.DescribeAvailabilityZonesInput, optFns ...func(*ec2.Options)) (*ec2.DescribeAvailabilityZonesOutput, error) {
8686
return b.client.DescribeAvailabilityZones(ctx, params, optFns...)
8787
}
88-
func (b *ec2ClientBase) CreateSnapshot(ctx context.Context, params *ec2.CreateSnapshotInput, optFns ...func(*ec2.Options)) (*ec2.CreateSnapshotOutput, error) {
88+
func (b *Ec2ClientBase) CreateSnapshot(ctx context.Context, params *ec2.CreateSnapshotInput, optFns ...func(*ec2.Options)) (*ec2.CreateSnapshotOutput, error) {
8989
return b.client.CreateSnapshot(ctx, params, optFns...)
9090
}
91-
func (b *ec2ClientBase) DeleteSnapshot(ctx context.Context, params *ec2.DeleteSnapshotInput, optFns ...func(*ec2.Options)) (*ec2.DeleteSnapshotOutput, error) {
91+
func (b *Ec2ClientBase) DeleteSnapshot(ctx context.Context, params *ec2.DeleteSnapshotInput, optFns ...func(*ec2.Options)) (*ec2.DeleteSnapshotOutput, error) {
9292
return b.client.DeleteSnapshot(ctx, params, optFns...)
9393
}
94-
func (b *ec2ClientBase) DescribeSnapshots(ctx context.Context, params *ec2.DescribeSnapshotsInput, optFns ...func(*ec2.Options)) (*ec2.DescribeSnapshotsOutput, error) {
94+
func (b *Ec2ClientBase) DescribeSnapshots(ctx context.Context, params *ec2.DescribeSnapshotsInput, optFns ...func(*ec2.Options)) (*ec2.DescribeSnapshotsOutput, error) {
9595
return b.client.DescribeSnapshots(ctx, params, optFns...)
9696
}
97-
func (b *ec2ClientBase) ModifyVolume(ctx context.Context, params *ec2.ModifyVolumeInput, optFns ...func(*ec2.Options)) (*ec2.ModifyVolumeOutput, error) {
97+
func (b *Ec2ClientBase) ModifyVolume(ctx context.Context, params *ec2.ModifyVolumeInput, optFns ...func(*ec2.Options)) (*ec2.ModifyVolumeOutput, error) {
9898
return b.client.ModifyVolume(ctx, params, optFns...)
9999
}
100-
func (b *ec2ClientBase) DescribeVolumesModifications(ctx context.Context, params *ec2.DescribeVolumesModificationsInput, optFns ...func(*ec2.Options)) (*ec2.DescribeVolumesModificationsOutput, error) {
100+
func (b *Ec2ClientBase) DescribeVolumesModifications(ctx context.Context, params *ec2.DescribeVolumesModificationsInput, optFns ...func(*ec2.Options)) (*ec2.DescribeVolumesModificationsOutput, error) {
101101
return b.client.DescribeVolumesModifications(ctx, params, optFns...)
102102
}
103-
func (b *ec2ClientBase) DescribeTags(ctx context.Context, params *ec2.DescribeTagsInput, optFns ...func(*ec2.Options)) (*ec2.DescribeTagsOutput, error) {
103+
func (b *Ec2ClientBase) DescribeTags(ctx context.Context, params *ec2.DescribeTagsInput, optFns ...func(*ec2.Options)) (*ec2.DescribeTagsOutput, error) {
104104
return b.client.DescribeTags(ctx, params, optFns...)
105105
}
106-
func (b *ec2ClientBase) CreateTags(ctx context.Context, params *ec2.CreateTagsInput, optFns ...func(*ec2.Options)) (*ec2.CreateTagsOutput, error) {
106+
func (b *Ec2ClientBase) CreateTags(ctx context.Context, params *ec2.CreateTagsInput, optFns ...func(*ec2.Options)) (*ec2.CreateTagsOutput, error) {
107107
return b.client.CreateTags(ctx, params, optFns...)
108108
}
109-
func (b *ec2ClientBase) DeleteTags(ctx context.Context, params *ec2.DeleteTagsInput, optFns ...func(*ec2.Options)) (*ec2.DeleteTagsOutput, error) {
109+
func (b *Ec2ClientBase) DeleteTags(ctx context.Context, params *ec2.DeleteTagsInput, optFns ...func(*ec2.Options)) (*ec2.DeleteTagsOutput, error) {
110110
return b.client.DeleteTags(ctx, params, optFns...)
111111
}
112-
func (b *ec2ClientBase) EnableFastSnapshotRestores(ctx context.Context, params *ec2.EnableFastSnapshotRestoresInput, optFns ...func(*ec2.Options)) (*ec2.EnableFastSnapshotRestoresOutput, error) {
112+
func (b *Ec2ClientBase) EnableFastSnapshotRestores(ctx context.Context, params *ec2.EnableFastSnapshotRestoresInput, optFns ...func(*ec2.Options)) (*ec2.EnableFastSnapshotRestoresOutput, error) {
113113
return b.client.EnableFastSnapshotRestores(ctx, params, optFns...)
114114
}
115115

pkg/plugin/plugin_common.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,27 +75,27 @@ type EbsCsiPlugin interface {
7575
GetNodeSegments() map[string]string
7676
}
7777

78-
// ebsCsiPluginBase implements stub functionality of all plugin methods except Init().
78+
// EbsCsiPluginBase implements stub functionality of all plugin methods except Init().
7979
// It is strongly recommended to embed into plugin implementations to prevent bulid failures
8080
// if/when new functions are added to the EbsCsiPlugin interface.
81-
type ebsCsiPluginBase struct{}
81+
type EbsCsiPluginBase struct{}
8282

83-
func (p *ebsCsiPluginBase) InitFlags(_ *pflag.FlagSet) {
83+
func (p *EbsCsiPluginBase) InitFlags(_ *pflag.FlagSet) {
8484
// Do nothing intentionally.
8585
}
8686

87-
func (p *ebsCsiPluginBase) GetEC2Client(_ aws.Config, _ ...func(o *ec2.Options)) util.EC2API {
87+
func (p *EbsCsiPluginBase) GetEC2Client(_ aws.Config, _ ...func(o *ec2.Options)) util.EC2API {
8888
return nil
8989
}
9090

91-
func (p *ebsCsiPluginBase) GetSageMakerClient(_ aws.Config, _ ...func(o *sagemaker.Options)) util.SageMakerAPI {
91+
func (p *EbsCsiPluginBase) GetSageMakerClient(_ aws.Config, _ ...func(o *sagemaker.Options)) util.SageMakerAPI {
9292
return nil
9393
}
9494

95-
func (p *ebsCsiPluginBase) GetDriverName() string {
95+
func (p *EbsCsiPluginBase) GetDriverName() string {
9696
return ""
9797
}
9898

99-
func (p *ebsCsiPluginBase) GetNodeSegments() map[string]string {
99+
func (p *EbsCsiPluginBase) GetNodeSegments() map[string]string {
100100
return map[string]string{}
101101
}

0 commit comments

Comments
 (0)