Skip to content

Commit bde3a1b

Browse files
JCoelhooJCoelhoo
authored
fix: k8 fromstate (#302)
1 parent c501d30 commit bde3a1b

File tree

5 files changed

+356
-343
lines changed

5 files changed

+356
-343
lines changed

‎resources/types/aws/kubernetes_cluster.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,12 @@ func (r AwsKubernetesCluster) FromState(state *output.TfState) (*resourcespb.Kub
150150
result.KubeConfigRaw = kubeCgfRaw
151151
}
152152

153+
var err error
154+
result.DefaultNodePool, err = AwsKubernetesNodePool{r.DefaultNodePool}.FromState(state)
155+
if err != nil {
156+
return nil, err
157+
}
158+
153159
return result, nil
154160
}
155161

‎resources/types/azure/kubernetes_cluster.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ func (r AzureKubernetesCluster) FromState(state *output.TfState) (*resourcespb.K
4343
result.KubeConfigRaw = values["kube_config_raw"].(string)
4444
}
4545

46+
var err error
47+
result.DefaultNodePool, err = AzureKubernetesNodePool{r.DefaultNodePool}.FromState(state)
48+
if err != nil {
49+
return nil, err
50+
}
51+
4652
return result, nil
4753
}
4854

‎test/_configs/network_interface/network_interface/config.textproto‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,103 @@
1-
resources: {
2-
resource_id: "example_vn_azure"
3-
resource_args: {
4-
resource_args: {
5-
[type.googleapis.com/dev.multy.resources.VirtualNetworkArgs]: {
6-
common_parameters: {
7-
resource_group_id: "rg1"
8-
location: EU_WEST_1
9-
cloud_provider: AZURE
1+
resources: {
2+
resource_id: "example_vn_azure"
3+
resource_args: {
4+
resource_args: {
5+
[type.googleapis.com/dev.multy.resources.VirtualNetworkArgs]: {
6+
common_parameters: {
7+
resource_group_id: "rg1"
8+
location: EU_WEST_1
9+
cloud_provider: AZURE
1010
}
11-
name: "example_vn"
12-
cidr_block: "10.0.0.0/16"
11+
name: "example_vn"
12+
cidr_block: "10.0.0.0/16"
1313
}
1414
}
1515
}
1616
}
17-
resources: {
18-
resource_id: "example_vn_aws"
19-
resource_args: {
20-
resource_args: {
21-
[type.googleapis.com/dev.multy.resources.VirtualNetworkArgs]: {
22-
common_parameters: {
23-
resource_group_id: "rg1"
24-
location: EU_WEST_1
25-
cloud_provider: AWS
17+
resources: {
18+
resource_id: "example_vn_aws"
19+
resource_args: {
20+
resource_args: {
21+
[type.googleapis.com/dev.multy.resources.VirtualNetworkArgs]: {
22+
common_parameters: {
23+
resource_group_id: "rg1"
24+
location: EU_WEST_1
25+
cloud_provider: AWS
2626
}
27-
name: "example_vn"
28-
cidr_block: "10.0.0.0/16"
27+
name: "example_vn"
28+
cidr_block: "10.0.0.0/16"
2929
}
3030
}
3131
}
3232
}
33-
resources: {
34-
resource_id: "subnet_aws"
35-
resource_args: {
36-
resource_args: {
37-
[type.googleapis.com/dev.multy.resources.SubnetArgs]: {
38-
name: "subnet"
39-
cidr_block: "10.0.2.0/24"
40-
virtual_network_id: "example_vn_aws"
41-
availability_zone: 2
33+
resources: {
34+
resource_id: "subnet_aws"
35+
resource_args: {
36+
resource_args: {
37+
[type.googleapis.com/dev.multy.resources.SubnetArgs]: {
38+
name: "subnet"
39+
cidr_block: "10.0.2.0/24"
40+
virtual_network_id: "example_vn_aws"
41+
availability_zone: 2
4242
}
4343
}
4444
}
4545
}
46-
resources: {
47-
resource_id: "subnet_azure"
48-
resource_args: {
49-
resource_args: {
50-
[type.googleapis.com/dev.multy.resources.SubnetArgs]: {
51-
name: "subnet"
52-
cidr_block: "10.0.2.0/24"
53-
virtual_network_id: "example_vn_azure"
54-
availability_zone: 2
46+
resources: {
47+
resource_id: "subnet_azure"
48+
resource_args: {
49+
resource_args: {
50+
[type.googleapis.com/dev.multy.resources.SubnetArgs]: {
51+
name: "subnet"
52+
cidr_block: "10.0.2.0/24"
53+
virtual_network_id: "example_vn_azure"
54+
availability_zone: 2
5555
}
5656
}
5757
}
5858
}
59-
resources: {
60-
resource_id: "nic_azure"
61-
resource_args: {
62-
resource_args: {
63-
[type.googleapis.com/dev.multy.resources.NetworkInterfaceArgs]: {
64-
common_parameters: {
65-
resource_group_id: "rg1"
66-
location: EU_WEST_1
67-
cloud_provider: AZURE
59+
resources: {
60+
resource_id: "nic_azure"
61+
resource_args: {
62+
resource_args: {
63+
[type.googleapis.com/dev.multy.resources.NetworkInterfaceArgs]: {
64+
common_parameters: {
65+
resource_group_id: "rg1"
66+
location: EU_WEST_1
67+
cloud_provider: AZURE
6868
}
69-
name: "test-nic"
70-
subnet_id: "subnet_azure"
69+
name: "test-nic"
70+
subnet_id: "subnet_azure"
7171
}
7272
}
7373
}
7474
}
75-
resources: {
76-
resource_id: "nic_aws"
77-
resource_args: {
78-
resource_args: {
79-
[type.googleapis.com/dev.multy.resources.NetworkInterfaceArgs]: {
80-
common_parameters: {
81-
resource_group_id: "rg1"
82-
location: EU_WEST_1
83-
cloud_provider: AWS
75+
resources: {
76+
resource_id: "nic_aws"
77+
resource_args: {
78+
resource_args: {
79+
[type.googleapis.com/dev.multy.resources.NetworkInterfaceArgs]: {
80+
common_parameters: {
81+
resource_group_id: "rg1"
82+
location: EU_WEST_1
83+
cloud_provider: AWS
8484
}
85-
name: "test-nic"
86-
subnet_id: "subnet_aws"
85+
name: "test-nic"
86+
subnet_id: "subnet_aws"
8787
}
8888
}
8989
}
9090
}
91-
resources: {
92-
resource_id: "rg1"
93-
resource_args: {
94-
resource_args: {
95-
[type.googleapis.com/dev.multy.resources.ResourceGroupArgs]: {
96-
common_parameters: {
97-
location: EU_WEST_1
98-
cloud_provider: AZURE
91+
resources: {
92+
resource_id: "rg1"
93+
resource_args: {
94+
resource_args: {
95+
[type.googleapis.com/dev.multy.resources.ResourceGroupArgs]: {
96+
common_parameters: {
97+
location: EU_WEST_1
98+
cloud_provider: AZURE
9999
}
100-
name: "rg1"
100+
name: "rg1"
101101
}
102102
}
103103
}

0 commit comments

Comments
 (0)