Skip to content

Commit a43cae0

Browse files
goncalo-rodriguesgoncalo-rodrigues
authored
Flatten protos so it's 1 per cloud (#119)
1 parent 25ce4f0 commit a43cae0

File tree

79 files changed

+4062
-6146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+4062
-6146
lines changed

‎api/converter/converter.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
)
1818

1919
type ResourceConverters[Arg proto.Message, OutT proto.Message] interface {
20-
Convert(resourceId string, request []Arg, state *output.TfState) (OutT, error)
20+
Convert(resourceId string, request Arg, state *output.TfState) (OutT, error)
2121
}
2222

2323
type MultyResourceConverter interface {
@@ -115,7 +115,7 @@ func (v VirtualMachineConverter) GetResourceType() string {
115115
}
116116

117117
func (v VnConverter) ConvertToMultyResource(resourceId string, m proto.Message, _ map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
118-
arg := m.(*resources.CloudSpecificVirtualNetworkArgs)
118+
arg := m.(*resources.VirtualNetworkArgs)
119119
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
120120
vn := types.VirtualNetwork{
121121
CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
@@ -129,7 +129,7 @@ func (v VnConverter) ConvertToMultyResource(resourceId string, m proto.Message,
129129
}, nil
130130
}
131131

132-
func getCommonParams(resourceId string, arg *common.CloudSpecificResourceCommonArgs, c cloud_providers.CloudProvider) *common_resources.CommonResourceParams {
132+
func getCommonParams(resourceId string, arg *common.ResourceCommonArgs, c cloud_providers.CloudProvider) *common_resources.CommonResourceParams {
133133
return &common_resources.CommonResourceParams{
134134
ResourceId: resourceId,
135135
ResourceGroupId: arg.ResourceGroupId,
@@ -139,7 +139,7 @@ func getCommonParams(resourceId string, arg *common.CloudSpecificResourceCommonA
139139
}
140140
}
141141

142-
func getCommonChildResourceParams(resourceId string, arg *common.CloudSpecificChildResourceCommonArgs) *common_resources.CommonResourceParams {
142+
func getCommonChildResourceParams(resourceId string, arg *common.ChildResourceCommonArgs) *common_resources.CommonResourceParams {
143143
return &common_resources.CommonResourceParams{
144144
ResourceId: resourceId,
145145
ResourceValidationInfo: validate.NewResourceValidationInfoWithId(resourceId),
@@ -173,7 +173,7 @@ func setReference[T any](resources map[string]common_resources.CloudSpecificReso
173173
}
174174

175175
func (v SubnetConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
176-
arg := m.(*resources.CloudSpecificSubnetArgs)
176+
arg := m.(*resources.SubnetArgs)
177177
subnet := types.Subnet{CommonResourceParams: getCommonChildResourceParams(resourceId, arg.CommonParameters),
178178
Name: arg.Name,
179179
CidrBlock: arg.CidrBlock,
@@ -193,7 +193,7 @@ func (v SubnetConverter) ConvertToMultyResource(resourceId string, m proto.Messa
193193
}
194194

195195
func (v NetworkInterfaceConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
196-
arg := m.(*resources.CloudSpecificNetworkInterfaceArgs)
196+
arg := m.(*resources.NetworkInterfaceArgs)
197197
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
198198
ni := types.NetworkInterface{CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
199199
Name: arg.Name,
@@ -212,7 +212,7 @@ func (v NetworkInterfaceConverter) ConvertToMultyResource(resourceId string, m p
212212
}
213213

214214
func (v RouteTableConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
215-
arg := m.(*resources.CloudSpecificRouteTableArgs)
215+
arg := m.(*resources.RouteTableArgs)
216216
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
217217
rt := types.RouteTable{CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
218218
Name: arg.Name,
@@ -239,7 +239,7 @@ func (v RouteTableConverter) ConvertToMultyResource(resourceId string, m proto.M
239239
}
240240

241241
func (v RouteTableAssociationConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
242-
arg := m.(*resources.CloudSpecificRouteTableAssociationArgs)
242+
arg := m.(*resources.RouteTableAssociationArgs)
243243
rta := types.RouteTableAssociation{CommonResourceParams: getCommonChildResourceParams(resourceId, arg.CommonParameters)}
244244

245245
err := setReference(otherResources, arg.SubnetId, &rta.SubnetId, resourceId, "subnet_id")
@@ -260,7 +260,7 @@ func (v RouteTableAssociationConverter) ConvertToMultyResource(resourceId string
260260
}
261261

262262
func (v NetworkSecurityGroupConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
263-
arg := m.(*resources.CloudSpecificNetworkSecurityGroupArgs)
263+
arg := m.(*resources.NetworkSecurityGroupArgs)
264264
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
265265
nsg := types.NetworkSecurityGroup{CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
266266
Name: arg.Name,
@@ -310,7 +310,7 @@ func convertPort(port int32) string {
310310
}
311311

312312
func (v DatabaseConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
313-
arg := m.(*resources.CloudSpecificDatabaseArgs)
313+
arg := m.(*resources.DatabaseArgs)
314314
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
315315
db := types.Database{CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
316316
Name: arg.Name,
@@ -338,7 +338,7 @@ func (v DatabaseConverter) ConvertToMultyResource(resourceId string, m proto.Mes
338338
}
339339

340340
func (v ObjectStorageConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
341-
arg := m.(*resources.CloudSpecificObjectStorageArgs)
341+
arg := m.(*resources.ObjectStorageArgs)
342342
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
343343
db := types.ObjectStorage{CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
344344
Name: arg.Name,
@@ -353,7 +353,7 @@ func (v ObjectStorageConverter) ConvertToMultyResource(resourceId string, m prot
353353
}
354354

355355
func (v ObjectStorageObjectConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
356-
arg := m.(*resources.CloudSpecificObjectStorageObjectArgs)
356+
arg := m.(*resources.ObjectStorageObjectArgs)
357357
obj := types.ObjectStorageObject{CommonResourceParams: getCommonChildResourceParams(resourceId, arg.CommonParameters),
358358
Name: arg.Name,
359359
Content: arg.Content,
@@ -375,7 +375,7 @@ func (v ObjectStorageObjectConverter) ConvertToMultyResource(resourceId string,
375375
}
376376

377377
func (v PublicIpConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
378-
arg := m.(*resources.CloudSpecificPublicIpArgs)
378+
arg := m.(*resources.PublicIpArgs)
379379
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
380380
obj := types.PublicIp{CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
381381
Name: arg.Name,
@@ -394,7 +394,7 @@ func (v PublicIpConverter) ConvertToMultyResource(resourceId string, m proto.Mes
394394
}
395395

396396
func (v KubernetesClusterConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
397-
arg := m.(*resources.CloudSpecificKubernetesClusterArgs)
397+
arg := m.(*resources.KubernetesClusterArgs)
398398
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
399399
kc := types.KubernetesService{CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
400400
Name: arg.Name,
@@ -425,7 +425,7 @@ func zeroToNil(a int32) *int {
425425
}
426426

427427
func (v KubernetesNodePoolConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
428-
arg := m.(*resources.CloudSpecificKubernetesNodePoolArgs)
428+
arg := m.(*resources.KubernetesNodePoolArgs)
429429
knp := types.KubernetesServiceNodePool{CommonResourceParams: getCommonChildResourceParams(resourceId, arg.CommonParameters),
430430
Name: arg.Name,
431431
IsDefaultPool: arg.IsDefaultPool,
@@ -458,7 +458,7 @@ func (v KubernetesNodePoolConverter) ConvertToMultyResource(resourceId string, m
458458
}
459459

460460
func (v LambdaConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
461-
arg := m.(*resources.CloudSpecificLambdaArgs)
461+
arg := m.(*resources.LambdaArgs)
462462
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
463463
l := types.Lambda{CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
464464
FunctionName: arg.Name,
@@ -478,7 +478,7 @@ func (v LambdaConverter) ConvertToMultyResource(resourceId string, m proto.Messa
478478
}
479479

480480
func (v VaultConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
481-
arg := m.(*resources.CloudSpecificVaultArgs)
481+
arg := m.(*resources.VaultArgs)
482482
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
483483
vault := types.Vault{CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
484484
Name: arg.Name,
@@ -492,7 +492,7 @@ func (v VaultConverter) ConvertToMultyResource(resourceId string, m proto.Messag
492492
}
493493

494494
func (v VaultAccessPolicyConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
495-
arg := m.(*resources.CloudSpecificVaultAccessPolicyArgs)
495+
arg := m.(*resources.VaultAccessPolicyArgs)
496496
vap := types.VaultAccessPolicy{CommonResourceParams: getCommonChildResourceParams(resourceId, arg.CommonParameters),
497497
Identity: arg.Identity,
498498
Access: strings.ToLower(arg.Access.String()),
@@ -511,7 +511,7 @@ func (v VaultAccessPolicyConverter) ConvertToMultyResource(resourceId string, m
511511
}
512512

513513
func (v VaultSecretConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
514-
arg := m.(*resources.CloudSpecificVaultSecretArgs)
514+
arg := m.(*resources.VaultSecretArgs)
515515
vs := types.VaultSecret{CommonResourceParams: getCommonChildResourceParams(resourceId, arg.CommonParameters),
516516
Name: arg.Name,
517517
Value: arg.Value,
@@ -530,7 +530,7 @@ func (v VaultSecretConverter) ConvertToMultyResource(resourceId string, m proto.
530530
}
531531

532532
func (v VirtualMachineConverter) ConvertToMultyResource(resourceId string, m proto.Message, otherResources map[string]common_resources.CloudSpecificResource) (common_resources.CloudSpecificResource, error) {
533-
arg := m.(*resources.CloudSpecificVirtualMachineArgs)
533+
arg := m.(*resources.VirtualMachineArgs)
534534
c := cloud_providers.CloudProvider(strings.ToLower(arg.CommonParameters.CloudProvider.String()))
535535
vm := types.VirtualMachine{CommonResourceParams: getCommonParams(resourceId, arg.CommonParameters, c),
536536
Name: arg.Name,

0 commit comments

Comments
 (0)