Skip to content

Commit ab1fc52

Browse files
Mark entrypoint required (#5318) (#10425)
Signed-off-by: Modular Magician <[email protected]>
1 parent 6e177c6 commit ab1fc52

File tree

4 files changed

+36
-26
lines changed

4 files changed

+36
-26
lines changed

.changelog/5318.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:breaking-change
2+
appengine: marked `google_app_engine_standard_app_version` `entrypoint` as required
3+
```

google/resource_app_engine_standard_app_version.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,21 @@ All files must be readable using the credentials supplied with this call.`,
9999
},
100100
},
101101
},
102+
"entrypoint": {
103+
Type: schema.TypeList,
104+
Required: true,
105+
Description: `The entrypoint for the application.`,
106+
MaxItems: 1,
107+
Elem: &schema.Resource{
108+
Schema: map[string]*schema.Schema{
109+
"shell": {
110+
Type: schema.TypeString,
111+
Required: true,
112+
Description: `The format should be a shell command that can be fed to bash -c.`,
113+
},
114+
},
115+
},
116+
},
102117
"runtime": {
103118
Type: schema.TypeString,
104119
Required: true,
@@ -203,21 +218,6 @@ A duration in seconds with up to nine fractional digits, terminated by 's'. Exam
203218
},
204219
ConflictsWith: []string{"automatic_scaling", "manual_scaling"},
205220
},
206-
"entrypoint": {
207-
Type: schema.TypeList,
208-
Optional: true,
209-
Description: `The entrypoint for the application.`,
210-
MaxItems: 1,
211-
Elem: &schema.Resource{
212-
Schema: map[string]*schema.Schema{
213-
"shell": {
214-
Type: schema.TypeString,
215-
Required: true,
216-
Description: `The format should be a shell command that can be fed to bash -c.`,
217-
},
218-
},
219-
},
220-
},
221221
"env_variables": {
222222
Type: schema.TypeMap,
223223
Optional: true,

website/docs/guides/version_4_upgrade.html.markdown

+7
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,13 @@ This field was incorrectly included in the GA `google` provider in past releases
402402
In order to continue to use the feature, add `provider = google-beta` to your
403403
resource definition.
404404

405+
## Resource: `google_app_engine_standard_app_version`
406+
407+
### `entrypoint` is now required
408+
409+
This resource would fail to deploy without this field defined. Specify the
410+
`entrypoint` block to fix any issues
411+
405412
## Resource: `google_compute_snapshot`
406413

407414
### `source_disk_link` is now removed

website/docs/r/app_engine_standard_app_version.html.markdown

+11-11
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ The following arguments are supported:
126126
Code and application artifacts that make up this version.
127127
Structure is [documented below](#nested_deployment).
128128

129+
* `entrypoint` -
130+
(Required)
131+
The entrypoint for the application.
132+
Structure is [documented below](#nested_entrypoint).
133+
129134
* `service` -
130135
(Required)
131136
AppEngine service resource
@@ -167,6 +172,12 @@ The following arguments are supported:
167172
(Required)
168173
Source URL
169174

175+
<a name="nested_entrypoint"></a>The `entrypoint` block supports:
176+
177+
* `shell` -
178+
(Required)
179+
The format should be a shell command that can be fed to bash -c.
180+
170181
- - -
171182

172183

@@ -198,11 +209,6 @@ The following arguments are supported:
198209
(Optional)
199210
Environment variables available to the application.
200211

201-
* `entrypoint` -
202-
(Optional)
203-
The entrypoint for the application.
204-
Structure is [documented below](#nested_entrypoint).
205-
206212
* `vpc_access_connector` -
207213
(Optional)
208214
Enables VPC connectivity for standard apps.
@@ -333,12 +339,6 @@ The following arguments are supported:
333339
(Optional)
334340
Version of the library to select, or "latest".
335341

336-
<a name="nested_entrypoint"></a>The `entrypoint` block supports:
337-
338-
* `shell` -
339-
(Required)
340-
The format should be a shell command that can be fed to bash -c.
341-
342342
<a name="nested_vpc_access_connector"></a>The `vpc_access_connector` block supports:
343343

344344
* `name` -

0 commit comments

Comments
 (0)