iSharkFly-Docs/packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builder/amazon/common/run_config.go: replace tabs with words

Browse Source
This commit is contained in:
Adrien Delorme 2020-07-20 16:26:45 +02:00
parent 1455a29f2b
commit 5c4901c2c2
2 changed files with 12 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
builder/amazon/common/run_config.go
View File

@ -223,10 +223,7 @@ type RunConfig struct {
// used when from_scratch is set to true.
SourceAmi string `mapstructure:"source_ami" required:"true"`
// Filters used to populate the `source_ami`
// field. Example:
//
// <Tabs>
// <Tab heading="JSON">
// field. JSON Example:
//
// ```json
// "builders" [
@ -244,9 +241,7 @@ type RunConfig struct {
// }
// ]
// ```
//
// </Tab>
// <Tab heading="HCL2">
// HCL2 example:
//
// ```hcl
// source "amazon-ebs" "basic-example" {
@ -262,9 +257,6 @@ type RunConfig struct {
// }
// ```
//
// </Tab>
// </Tabs>
//
// This selects the most recent Ubuntu 16.04 HVM EBS AMI from Canonical. NOTE:
// This will fail unless *exactly* one AMI is returned. In the above example,
// `most_recent` will cause this to succeed by selecting the newest image.
@ -331,10 +323,7 @@ type RunConfig struct {
// will allow you to create those programatically.
SpotTag hcl2template.KeyValues `mapstructure:"spot_tag" required:"false"`
// Filters used to populate the `subnet_id` field.
// Example:
//
// <Tabs>
// <Tab heading="JSON">
// JSON Example:
//
// ```json
// "builders" [
@ -350,9 +339,7 @@ type RunConfig struct {
// }
// ]
// ```
//
// </Tab>
// <Tab heading="HCL2">
// HCL2 example:
//
// ```hcl
// source "amazon-ebs" "basic-example" {
@ -366,9 +353,6 @@ type RunConfig struct {
// }
// ```
//
// </Tab>
// </Tabs>
//
// This selects the Subnet with tag `Class` with the value `build`, which has
// the most free IP addresses. NOTE: This will fail unless *exactly* one
// Subnet is returned. By using `most_free` or `random` one will be selected
@ -412,10 +396,7 @@ type RunConfig struct {
// data when launching the instance.
UserDataFile string `mapstructure:"user_data_file" required:"false"`
// Filters used to populate the `vpc_id` field.
// Example:
//
// <Tabs>
// <Tab heading="JSON">
// JSON Example:
//
// ```json
// "builders" [
@ -431,9 +412,7 @@ type RunConfig struct {
// }
// ]
// ```
//
// </Tab>
// <Tab heading="HCL2">
// HCL2 example:
//
// ```hcl
// source "amazon-ebs" "basic-example" {
@ -447,9 +426,6 @@ type RunConfig struct {
// }
// ```
//
// </Tab>
// </Tabs>
//
// This selects the VPC with tag `Class` with the value `build`, which is not
// the default VPC, and have a IPv4 CIDR block of `/24`. NOTE: This will fail
// unless *exactly* one VPC is returned.

36
website/pages/partials/builder/amazon/common/RunConfig-not-required.mdx
View File

@ -144,10 +144,7 @@
security_group_id.
- `source_ami_filter` (AmiFilterOptions) - Filters used to populate the `source_ami`
field. Example:
<Tabs>
<Tab heading="JSON">
field. JSON Example:
```json
"builders" [
@ -165,9 +162,7 @@
}
]
```
</Tab>
<Tab heading="HCL2">
HCL2 example:
```hcl
source "amazon-ebs" "basic-example" {
@ -183,9 +178,6 @@
}
```
</Tab>
</Tabs>
This selects the most recent Ubuntu 16.04 HVM EBS AMI from Canonical. NOTE:
This will fail unless *exactly* one AMI is returned. In the above example,
`most_recent` will cause this to succeed by selecting the newest image.
@ -246,10 +238,7 @@
will allow you to create those programatically.
- `subnet_filter` (SubnetFilterOptions) - Filters used to populate the `subnet_id` field.
Example:
<Tabs>
<Tab heading="JSON">
JSON Example:
```json
"builders" [
@ -265,9 +254,7 @@
}
]
```
</Tab>
<Tab heading="HCL2">
HCL2 example:
```hcl
source "amazon-ebs" "basic-example" {
@ -281,9 +268,6 @@
}
```
</Tab>
</Tabs>
This selects the Subnet with tag `Class` with the value `build`, which has
the most free IP addresses. NOTE: This will fail unless *exactly* one
Subnet is returned. By using `most_free` or `random` one will be selected
@ -327,10 +311,7 @@
data when launching the instance.
- `vpc_filter` (VpcFilterOptions) - Filters used to populate the `vpc_id` field.
Example:
<Tabs>
<Tab heading="JSON">
JSON Example:
```json
"builders" [
@ -346,9 +327,7 @@
}
]
```
</Tab>
<Tab heading="HCL2">
HCL2 example:
```hcl
source "amazon-ebs" "basic-example" {
@ -362,9 +341,6 @@
}
```
</Tab>
</Tabs>
This selects the VPC with tag `Class` with the value `build`, which is not
the default VPC, and have a IPv4 CIDR block of `/24`. NOTE: This will fail
unless *exactly* one VPC is returned.