Skip to content

Commit 5570864

Browse files
Replace go-bindata with go:embed (#497)
* Replace `go-bindata` with `go:embed` * Restyled by gofmt * Rename Setup to SetupScript Co-authored-by: Restyled.io <[email protected]>
1 parent 4abdef7 commit 5570864

File tree

4 files changed

+9
-278
lines changed

4 files changed

+9
-278
lines changed

environment/environment.go

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package environment
2+
3+
import _ "embed"
4+
5+
//go:embed setup.sh
6+
var SetupScript string

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module terraform-provider-iterative
22

3-
go 1.14
3+
go 1.16
44

55
require (
66
github.com/Azure/azure-sdk-for-go v58.1.0+incompatible

iterative/bindata.go

-271
This file was deleted.

iterative/resource_runner.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616

1717
"gopkg.in/alessio/shellescape.v1"
1818

19+
"terraform-provider-iterative/environment"
1920
"terraform-provider-iterative/iterative/utils"
2021

2122
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
@@ -430,11 +431,6 @@ func provisionerCode(d *schema.ResourceData) (string, error) {
430431
return code, err
431432
}
432433

433-
setup, err := Asset("../environment/setup.sh")
434-
if err != nil {
435-
return code, err
436-
}
437-
438434
data := make(map[string]interface{})
439435
data["token"] = d.Get("token").(string)
440436
data["repo"] = d.Get("repo").(string)
@@ -458,7 +454,7 @@ func provisionerCode(d *schema.ResourceData) (string, error) {
458454
data["GOOGLE_APPLICATION_CREDENTIALS_DATA"] = utils.LoadGCPCredentials()
459455
data["KUBERNETES_CONFIGURATION"] = os.Getenv("KUBERNETES_CONFIGURATION")
460456
data["container"] = isContainerAvailable(d.Get("cloud").(string))
461-
data["setup"] = strings.Replace(string(setup[:]), "#/bin/sh", "", 1)
457+
data["setup"] = strings.Replace(environment.SetupScript, "#/bin/sh", "", 1)
462458
data["setupCML"] = utils.GetCML(d.Get("cml_version").(string))
463459

464460
return renderScript(data)

0 commit comments

Comments
 (0)