Skip to content

Commit 105761d

Browse files
mcuadrosmcuadros
committed
ci: fix github action
1 parent d51fb0c commit 105761d

File tree

6 files changed

+16
-175
lines changed

6 files changed

+16
-175
lines changed

‎.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
go-version: [1.13.x, 1.14.x]
14+
go-version: [1.15.x, 1.16.x]
1515
platform: [ubuntu-latest, macos-latest, windows-latest]
1616
runs-on: ${{ matrix.platform }}
1717
steps:
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@v2
2626

2727
- name: Allow skip provisioner tests
28-
uses: allenevans/set-env@v1.0.0
28+
uses: allenevans/set-env@v2.0.0
2929
if: matrix.os != 'ubuntu-latest'
3030
with:
3131
ALLOW_PROVISIONER_SKIP: 1

‎starlark/types/backend.go

+9-2
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,18 @@ func (s *State) initializeResource(p *Provider, r *states.Resource) error {
286286
mode := addrsResourceModeString(r.Addr.Mode)
287287

288288
var schema providers.Schema
289+
var ok bool
289290
switch r.Addr.Mode {
290291
case addrs.DataResourceMode:
291-
schema = p.dataSources.schemas[typ]
292+
schema, ok = p.dataSources.schemas[typ]
293+
if !ok {
294+
return fmt.Errorf("unknown data resource %s", typ)
295+
}
292296
case addrs.ManagedResourceMode:
293-
schema = p.resources.schemas[typ]
297+
schema, ok = p.resources.schemas[typ]
298+
if !ok {
299+
return fmt.Errorf("unknown resource %s", typ)
300+
}
294301
default:
295302
return fmt.Errorf("invalid resource type")
296303
}

‎starlark/types/fixtures/state/terraform.tfstate

-32
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,6 @@
2323
}
2424
]
2525
},
26-
{
27-
"mode": "data",
28-
"type": "helm_repository",
29-
"name": "stable",
30-
"provider": "provider.helm.default",
31-
"instances": [
32-
{
33-
"schema_version": 0,
34-
"attributes": {
35-
"ca_file": null,
36-
"cert_file": null,
37-
"id": "stable",
38-
"key_file": null,
39-
"metadata": [
40-
{
41-
"name": "stable",
42-
"url": "https://kubernetes-charts.storage.googleapis.com"
43-
}
44-
],
45-
"name": "stable",
46-
"password": null,
47-
"url": "https://kubernetes-charts.storage.googleapis.com",
48-
"username": null
49-
}
50-
}
51-
]
52-
},
5326
{
5427
"mode": "managed",
5528
"type": "google_container_cluster",
@@ -352,7 +325,6 @@
352325
"reuse_values": false,
353326
"set": [],
354327
"set_sensitive": [],
355-
"set_string": [],
356328
"skip_crds": false,
357329
"status": "deployed",
358330
"timeout": 300,
@@ -424,7 +396,6 @@
424396
}
425397
],
426398
"set_sensitive": [],
427-
"set_string": [],
428399
"skip_crds": false,
429400
"status": "deployed",
430401
"timeout": 300,
@@ -498,7 +469,6 @@
498469
}
499470
],
500471
"set_sensitive": [],
501-
"set_string": [],
502472
"skip_crds": false,
503473
"status": "deployed",
504474
"timeout": 300,
@@ -565,7 +535,6 @@
565535
}
566536
],
567537
"set_sensitive": [],
568-
"set_string": [],
569538
"skip_crds": false,
570539
"status": "deployed",
571540
"timeout": 300,
@@ -626,7 +595,6 @@
626595
"reuse_values": false,
627596
"set": [],
628597
"set_sensitive": [],
629-
"set_string": [],
630598
"skip_crds": false,
631599
"status": "deployed",
632600
"timeout": 300,

‎starlark/types/resource.go

+4
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@ func NewResource(
224224
b *configschema.Block, provider *Provider, parent *Resource,
225225
cs starlark.CallStack,
226226
) *Resource {
227+
228+
if b == nil {
229+
b.Attributes["fpoo"] = nil
230+
}
227231
return &Resource{
228232
name: name,
229233
typ: typ,

‎starlark/types/testdata/examples/provider_resource.star

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
helm = tf.provider("helm")
1+
helm = tf.provider("helm", "1.0.0")
22

33
podinfo = helm.resource.release("podinfo")
44
podinfo.chart = "podinfo"

‎starlark/types/testdata/examples/terraform.tfstate

-138
Original file line numberDiff line numberDiff line change
@@ -23,33 +23,6 @@
2323
}
2424
]
2525
},
26-
{
27-
"mode": "data",
28-
"type": "helm_repository",
29-
"name": "stable",
30-
"provider": "provider.helm.default",
31-
"instances": [
32-
{
33-
"schema_version": 0,
34-
"attributes": {
35-
"ca_file": null,
36-
"cert_file": null,
37-
"id": "stable",
38-
"key_file": null,
39-
"metadata": [
40-
{
41-
"name": "stable",
42-
"url": "https://kubernetes-charts.storage.googleapis.com"
43-
}
44-
],
45-
"name": "stable",
46-
"password": null,
47-
"url": "https://kubernetes-charts.storage.googleapis.com",
48-
"username": null
49-
}
50-
}
51-
]
52-
},
5326
{
5427
"mode": "managed",
5528
"type": "google_container_cluster",
@@ -59,19 +32,6 @@
5932
{
6033
"schema_version": 1,
6134
"attributes": {
62-
"additional_zones": [],
63-
"addons_config": [
64-
{
65-
"horizontal_pod_autoscaling": [],
66-
"http_load_balancing": [],
67-
"kubernetes_dashboard": [],
68-
"network_policy_config": [
69-
{
70-
"disabled": true
71-
}
72-
]
73-
}
74-
],
7535
"authenticator_groups_config": [],
7636
"cluster_autoscaling": [
7737
{
@@ -127,37 +87,6 @@
12787
"provider": "PROVIDER_UNSPECIFIED"
12888
}
12989
],
130-
"node_config": [
131-
{
132-
"disk_size_gb": 100,
133-
"disk_type": "pd-standard",
134-
"guest_accelerator": [],
135-
"image_type": "COS",
136-
"labels": {},
137-
"local_ssd_count": 0,
138-
"machine_type": "n1-standard-2",
139-
"metadata": {
140-
"disable-legacy-endpoints": "true"
141-
},
142-
"min_cpu_platform": "",
143-
"oauth_scopes": [
144-
"https://www.googleapis.com/auth/logging.write",
145-
"https://www.googleapis.com/auth/monitoring"
146-
],
147-
"preemptible": true,
148-
"sandbox_config": [],
149-
"service_account": "default",
150-
"shielded_instance_config": [
151-
{
152-
"enable_integrity_monitoring": true,
153-
"enable_secure_boot": false
154-
}
155-
],
156-
"tags": [],
157-
"taint": [],
158-
"workload_metadata_config": []
159-
}
160-
],
16190
"node_locations": [
16291
"us-central1-a",
16392
"us-central1-b",
@@ -181,37 +110,6 @@
181110
"max_pods_per_node": 0,
182111
"name": "primary-node-pool",
183112
"name_prefix": "",
184-
"node_config": [
185-
{
186-
"disk_size_gb": 100,
187-
"disk_type": "pd-standard",
188-
"guest_accelerator": [],
189-
"image_type": "COS",
190-
"labels": {},
191-
"local_ssd_count": 0,
192-
"machine_type": "n1-standard-2",
193-
"metadata": {
194-
"disable-legacy-endpoints": "true"
195-
},
196-
"min_cpu_platform": "",
197-
"oauth_scopes": [
198-
"https://www.googleapis.com/auth/logging.write",
199-
"https://www.googleapis.com/auth/monitoring"
200-
],
201-
"preemptible": true,
202-
"sandbox_config": [],
203-
"service_account": "default",
204-
"shielded_instance_config": [
205-
{
206-
"enable_integrity_monitoring": true,
207-
"enable_secure_boot": false
208-
}
209-
],
210-
"tags": [],
211-
"taint": [],
212-
"workload_metadata_config": []
213-
}
214-
],
215113
"node_count": 1,
216114
"version": "1.14.10-gke.17"
217115
}
@@ -262,37 +160,6 @@
262160
"max_pods_per_node": null,
263161
"name": "primary-node-pool",
264162
"name_prefix": "",
265-
"node_config": [
266-
{
267-
"disk_size_gb": 100,
268-
"disk_type": "pd-standard",
269-
"guest_accelerator": [],
270-
"image_type": "COS",
271-
"labels": {},
272-
"local_ssd_count": 0,
273-
"machine_type": "n1-standard-2",
274-
"metadata": {
275-
"disable-legacy-endpoints": "true"
276-
},
277-
"min_cpu_platform": "",
278-
"oauth_scopes": [
279-
"https://www.googleapis.com/auth/logging.write",
280-
"https://www.googleapis.com/auth/monitoring"
281-
],
282-
"preemptible": true,
283-
"sandbox_config": [],
284-
"service_account": "default",
285-
"shielded_instance_config": [
286-
{
287-
"enable_integrity_monitoring": true,
288-
"enable_secure_boot": false
289-
}
290-
],
291-
"tags": [],
292-
"taint": [],
293-
"workload_metadata_config": []
294-
}
295-
],
296163
"node_count": 1,
297164
"project": "project-foo",
298165
"region": null,
@@ -352,7 +219,6 @@
352219
"reuse_values": false,
353220
"set": [],
354221
"set_sensitive": [],
355-
"set_string": [],
356222
"skip_crds": false,
357223
"status": "deployed",
358224
"timeout": 300,
@@ -424,7 +290,6 @@
424290
}
425291
],
426292
"set_sensitive": [],
427-
"set_string": [],
428293
"skip_crds": false,
429294
"status": "deployed",
430295
"timeout": 300,
@@ -498,7 +363,6 @@
498363
}
499364
],
500365
"set_sensitive": [],
501-
"set_string": [],
502366
"skip_crds": false,
503367
"status": "deployed",
504368
"timeout": 300,
@@ -565,7 +429,6 @@
565429
}
566430
],
567431
"set_sensitive": [],
568-
"set_string": [],
569432
"skip_crds": false,
570433
"status": "deployed",
571434
"timeout": 300,
@@ -626,7 +489,6 @@
626489
"reuse_values": false,
627490
"set": [],
628491
"set_sensitive": [],
629-
"set_string": [],
630492
"skip_crds": false,
631493
"status": "deployed",
632494
"timeout": 300,

0 commit comments

Comments
 (0)