Skip to content

Commit

Permalink
refactor: Add version for terraform template (#22)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yufeiminds
yufeiminds committed Oct 17, 2023
1 parent 62ca979 commit c1e5cc6
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 39 deletions.
28 changes: 14 additions & 14 deletions templates/terraform/builder/model.cue → templates/terraform/v1/builder/model.cue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ import (
_resource: gotemplate.Execute(_resource_template, {
"name": naming.#UpperCamel & {"name": name}
"pkg": pkg
v: rs
"v": rs
properties: [
for i, pinfo in rs.models[name].properties {
gotemplate.Execute(_prop_template, {
name: naming.#Snake & {"name": pinfo.name}
v: pinfo
index: i + 1
"name": naming.#Snake & {"name": pinfo.name}
"v": pinfo
"index": i + 1
})
},
]
Expand All @@ -135,29 +135,29 @@ import (
_data_source: gotemplate.Execute(_data_source_template, {
"name": naming.#UpperCamel & {"name": name}
"pkg": pkg
v: rs
"v": rs
properties: [
for i, pinfo in rs.models[name].properties {
gotemplate.Execute(_prop_template, {
name: naming.#Snake & {"name": pinfo.name}
v: pinfo
index: i + 1
"name": naming.#Snake & {"name": pinfo.name}
"v": pinfo
"index": i + 1
})
},
]
})

_models: [
for mname, minfo in rs.models if mname != name {
for mname, minfo in (rs.models | *{}) if mname != name {
gotemplate.Execute(_model_template, {
name: naming.#UpperCamel & {"name": mname}
v: minfo
"name": naming.#UpperCamel & {"name": mname}
"v": minfo
properties: [
for i, pinfo in minfo.properties {
gotemplate.Execute(_prop_template, {
name: naming.#Snake & {"name": pinfo.name}
v: pinfo
index: i + 1
"name": naming.#Snake & {"name": pinfo.name}
"v": pinfo
"index": i + 1
})
},
]
Expand Down
0 templates/terraform/builder/schema.cue → templates/terraform/v1/builder/schema.cue
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion templates/terraform/consts.cue → templates/terraform/v1/consts.cue
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package terraform
package v1

import (
gotemplate "text/template"
Expand Down
0 ...lates/terraform/datasource/datasource.cue → ...es/terraform/v1/datasource/datasource.cue
View file
File renamed without changes.
0 templates/terraform/datasource/doc.cue → templates/terraform/v1/datasource/doc.cue
View file
File renamed without changes.
0 templates/terraform/datasource/list.cue → templates/terraform/v1/datasource/list.cue
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions templates/terraform/datasource/model.cue → templates/terraform/v1/datasource/model.cue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ package datasource
import (
template "github.com/GuanceCloud/iacker/pkg/template/v1"
naming "github.com/GuanceCloud/iacker/pkg/helpers/naming"
builder "github.com/GuanceCloud/iacker/templates/terraform/builder"
builder "github.com/GuanceCloud/iacker/templates/terraform/v1/builder"
)

// Generate go types of resource model
for rsname, rsinfo in inputs.resources {
if (*rsinfo.meta.datasource | false) {
outputs: files: "internal/datasources/\((naming.#Snake & {"name": rsinfo.plural}).lower)/model.go": template.#File & {
_builder: builder.#StructBuilder & {
pkg: (naming.#Snake & {"name": rsinfo.plural}).lower
name: rsname
rs: rsinfo
isds: true
"pkg": (naming.#Snake & {"name": rsinfo.plural}).lower
"name": rsname
"rs": rsinfo
"isds": true
}
content: _builder.output
}
Expand Down
0 templates/terraform/datasource/operation.cue → ...tes/terraform/v1/datasource/operation.cue
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions templates/terraform/datasource/schema.cue → templates/terraform/v1/datasource/schema.cue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ package schema
import (
template "github.com/GuanceCloud/iacker/pkg/template/v1"
naming "github.com/GuanceCloud/iacker/pkg/helpers/naming"
builder "github.com/GuanceCloud/iacker/templates/terraform/builder"
builder "github.com/GuanceCloud/iacker/templates/terraform/v1/builder"
)

// Generate Terraform schema
for rsname, rsinfo in inputs.resources {
if (*rsinfo.meta.datasource | false) {
outputs: files: "internal/datasources/\((naming.#Snake & {"name": rsinfo.plural}).lower)/schema.go": template.#File & {
_builder: builder.#SchemaBuilder & {
pkg: (naming.#Snake & {"name": rsinfo.plural}).lower
name: rsname
rs: rsinfo
isds: true
"pkg": (naming.#Snake & {"name": rsinfo.plural}).lower
"name": rsname
"rs": rsinfo
"isds": true
}
content: _builder.output
}
Expand Down
6 changes: 3 additions & 3 deletions templates/terraform/manifest.cue → templates/terraform/v1/manifest.cue
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package terraform
package v1

import (
template "github.com/GuanceCloud/iacker/pkg/template/v1"
resource "github.com/GuanceCloud/iacker/templates/terraform/resource"
datasource "github.com/GuanceCloud/iacker/templates/terraform/datasource"
resource "github.com/GuanceCloud/iacker/templates/terraform/v1/resource"
datasource "github.com/GuanceCloud/iacker/templates/terraform/v1/datasource"
)

name: "terraform"
Expand Down
0 templates/terraform/resource/doc.cue → templates/terraform/v1/resource/doc.cue
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion templates/terraform/resource/list.cue → templates/terraform/v1/resource/list.cue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ outputs: files: "\(provider)/resources.go": template.#File & {
for rsname, rsinfo in inputs.resources {
if !(*rsinfo.meta.datasource | false) {
(rsname): naming.#UpperCamel & {
name: rsname
"name": rsname
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions templates/terraform/resource/model.cue → templates/terraform/v1/resource/model.cue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import (
"strings"

template "github.com/GuanceCloud/iacker/pkg/template/v1"
builder "github.com/GuanceCloud/iacker/templates/terraform/builder"
builder "github.com/GuanceCloud/iacker/templates/terraform/v1/builder"
)

// Generate go types of resource model
for rsname, rsinfo in inputs.resources {
if !(*rsinfo.meta.datasource | false) {
outputs: files: "internal/resources/\(strings.ToLower(rsname))/model.go": template.#File & {
_builder: builder.#StructBuilder & {
pkg: strings.ToLower(rsname)
name: rsname
rs: rsinfo
"pkg": strings.ToLower(rsname)
"name": rsname
"rs": rsinfo
}
content: _builder.output
}
Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/resource/operation.cue → ...lates/terraform/v1/resource/operation.cue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ for rsname, rsinfo in inputs.resources {
if !(*rsinfo.meta.datasource | false) {
outputs: files: "internal/resources/\(strings.ToLower(rsname))/resource.go": template.#File & {
content: gotemplate.Execute(_resource_operation_template, {
name: naming.#UpperCamel & {"name": rsname}
"name": naming.#UpperCamel & {"name": rsname}
})
}
}
Expand Down
0 templates/terraform/resource/resource.cue → templates/terraform/v1/resource/resource.cue
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions templates/terraform/resource/schema.cue → templates/terraform/v1/resource/schema.cue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import (
"strings"

template "github.com/GuanceCloud/iacker/pkg/template/v1"
builder "github.com/GuanceCloud/iacker/templates/terraform/builder"
builder "github.com/GuanceCloud/iacker/templates/terraform/v1/builder"
)

// Generate Terraform schema
for rsname, rsinfo in inputs.resources {
if !(*rsinfo.meta.datasource | false) {
outputs: files: "internal/resources/\(strings.ToLower(rsname))/schema.go": template.#File & {
_builder: builder.#SchemaBuilder & {
pkg: strings.ToLower(rsname)
name: rsname
rs: rsinfo
"name": rsname
"pkg": strings.ToLower(rsname)
"rs": rsinfo
}
content: _builder.output
}
Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/tests/manifest.cue → templates/terraform/v1/tests/manifest.cue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package tests

import (
"github.com/GuanceCloud/iacker/examples/petstore"
"github.com/GuanceCloud/iacker/templates/terraform"
"github.com/GuanceCloud/iacker/templates/terraform/v1"
)

resources: petstore.resources
Expand Down

0 comments on commit c1e5cc6

Please sign in to comment.