Skip to content
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

Jump to bottom

Fix wrong type of providers.aws.bakeryDefaults.baseImages[].virtualizationSettings #175

Merged
merged 3 commits into from
May 18, 2021
Merged

Fix wrong type of providers.aws.bakeryDefaults.baseImages[].virtualizationSettings #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9214a84
Change type of `providers.aws.bakeryDefaults.baseImages[].virtualizat…
yyuu May 14, 2021
6cb5ff8
Fix broken test after changing `providers.aws.bakeryDefaults.baseImag…
yyuu May 15, 2021
8095e22
Fix `golangci-lint` suggestions on simplifying the code
yyuu May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions api/client/cloudprovider/aws.pb.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion api/proto/cloudprovider/aws.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ message AwsBaseImageSettings {
AwsBaseImage baseImage = 1;

// Base image virtualization settings.
AwsVirtualizationSettings virtualizationSettings = 2;
repeated AwsVirtualizationSettings virtualizationSettings = 2;
}

// Base image configuration.
Expand Down
2 changes: 1 addition & 1 deletion docs/docs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2173,7 +2173,7 @@ Configuration for a base image for the AWS provider's bakery.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| baseImage | [AwsBaseImage](#proto.cloudprovider.AwsBaseImage) | | Base image configuration. |
| virtualizationSettings | [AwsVirtualizationSettings](#proto.cloudprovider.AwsVirtualizationSettings) | | Base image virtualization settings. |
| virtualizationSettings | [AwsVirtualizationSettings](#proto.cloudprovider.AwsVirtualizationSettings) | repeated | Base image virtualization settings. |



Expand Down
20 changes: 12 additions & 8 deletions internal/convert/rosco_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,12 @@ var roscoTests = configTest{
Id: "my-image",
ShortDescription: "this is an image",
},
VirtualizationSettings: &cloudprovider.AwsVirtualizationSettings{
Region: "us-east-1",
VirtualizationType: "hvm",
InstanceType: "t2-micro",
VirtualizationSettings: []*cloudprovider.AwsVirtualizationSettings{
{
Region: "us-east-1",
VirtualizationType: "hvm",
InstanceType: "t2-micro",
},
},
},
},
Expand All @@ -123,10 +125,12 @@ var roscoTests = configTest{
Id: "my-image",
ShortDescription: "this is an image",
},
VirtualizationSettings: &cloudprovider.AwsVirtualizationSettings{
Region: "us-east-1",
VirtualizationType: "hvm",
InstanceType: "t2-micro",
VirtualizationSettings: []*cloudprovider.AwsVirtualizationSettings{
{
Region: "us-east-1",
VirtualizationType: "hvm",
InstanceType: "t2-micro",
},
},
},
},
Expand Down
1 change: 1 addition & 0 deletions testdata/clouddriver.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ aws:
id: my-image-id
shortDescription: my short description
virtualizationSettings:
- region: us-west-2
sourceAmi: my-source-ami
virtualizationType: pv
defaultVirtualizationType: pv
Expand Down
5 changes: 3 additions & 2 deletions testdata/halconfig.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,9 @@ providers:
id: my-image-id
shortDescription: my short description
virtualizationSettings:
sourceAmi: my-source-ami
virtualizationType: pv
- region: us-west-2
sourceAmi: my-source-ami
virtualizationType: pv
defaultVirtualizationType: pv
templateFile: file
defaultKeyPairTemplate: '{{name}}-keypair'
Expand Down
1 change: 1 addition & 0 deletions testdata/rosco.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ aws:
id: my-image-id
shortDescription: my short description
virtualizationSettings:
- region: us-west-2
sourceAmi: my-source-ami
virtualizationType: pv
defaultVirtualizationType: pv
Expand Down