varnitgoyal95/infra-provisioner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INFRA-2938 | Abhishek | Fix tests

Browse Source
This commit is contained in:
Abhishek Katiyar
2024-03-11 20:33:50 +05:30
parent d905334205
commit 56cb37e03d
5 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,4 +2,3 @@
vendor
actual_output/
infra-provisioner-v2
rds-tf

34
bindata/bindata.go
View File

@@ -116,7 +116,7 @@ func bindataTemplatesAuroradbtfDeploySh() (*asset, error) {
size: 1515,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -146,7 +146,7 @@ func bindataTemplatesAuroradbtfMainTf() (*asset, error) {
size: 9464,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -176,7 +176,7 @@ func bindataTemplatesAwsrolestfDeploySh() (*asset, error) {
size: 1993,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -206,7 +206,7 @@ func bindataTemplatesAwsrolestfMainTf() (*asset, error) {
size: 1444,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -236,7 +236,7 @@ func bindataTemplatesAwss3buckettfDeploySh() (*asset, error) {
size: 1075,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -266,7 +266,7 @@ func bindataTemplatesAwss3buckettfMainTf() (*asset, error) {
size: 1305,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -296,7 +296,7 @@ func bindataTemplatesDocumentdbtfDeploySh() (*asset, error) {
size: 1045,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -326,7 +326,7 @@ func bindataTemplatesDocumentdbtfMainTf() (*asset, error) {
size: 4899,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -356,7 +356,7 @@ func bindataTemplatesDynamodbtfDeploySh() (*asset, error) {
size: 646,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -386,7 +386,7 @@ func bindataTemplatesDynamodbtfMainTf() (*asset, error) {
size: 3707,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -416,7 +416,7 @@ func bindataTemplatesElasticcachetfDeploySh() (*asset, error) {
size: 1047,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -446,7 +446,7 @@ func bindataTemplatesElasticcachetfMainTf() (*asset, error) {
size: 1883,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -476,7 +476,7 @@ func bindataTemplatesRdstfDeploySh() (*asset, error) {
size: 4116,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710168077, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -506,7 +506,7 @@ func bindataTemplatesRdstfMainTf() (*asset, error) {
size: 11001,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710168077, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -536,7 +536,7 @@ func bindataTemplatesRdstfScriptsPostterraformapplyModifyversion11to13Sh() (*ass
size: 2751,
md5checksum: "",
mode: os.FileMode(493),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -566,7 +566,7 @@ func bindataTemplatesRdstfScriptsPreterraformapplyModifyversion11to13Sh() (*asse
size: 5536,
md5checksum: "",
mode: os.FileMode(493),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}
@@ -596,7 +596,7 @@ func bindataTemplatesRdstfScriptsRunadditionalscriptsSh() (*asset, error) {
size: 1443,
md5checksum: "",
mode: os.FileMode(420),
modTime: time.Unix(1710156991, 0),
modTime: time.Unix(1710162920, 0),
}
a := &asset{bytes: bytes, info: info}

2
main_test.go
View File

@@ -90,7 +90,7 @@ func compareResourceWithOutput(resourceDir string, resource string, manifestFile
return err
}
err = templateResourceTf(resource, resourceDir, manifest)
err = templateResourceTf(resource, resourceDir, manifest, actualOutputPath)
if err != nil {
return err
}

13
resource.go
View File

@@ -44,7 +44,7 @@ var extraResourcesDeploymentStatus ExtraResourcesDeployment
func provisionResource(resourceName, resourceDir string, manifest *Manifest) error {
err := templateResourceTf(resourceName, resourceDir, manifest)
err := templateResourceTf(resourceName, resourceDir, manifest, resourceDir)
if err != nil {
log.Fatalf("\nErr: %v", err)
@@ -205,14 +205,13 @@ func checkResourceExists(resourceName string, manifest *Manifest) bool {
return false
}
func templateResourceTf(templateName, resourceDir string, manifest *Manifest) error {
pathFilter := filepath.Join(TemplatesDir, resourceDir, "/")
log.Printf("Processing path %s", pathFilter)
func templateResourceTf(templateName, resourceDir string, manifest *Manifest, destinationDir string) error {
log.Printf("Processing path %s", filepath.Join(TemplatesDir, resourceDir))
assetNames := bindata.AssetNames()
filteredAssets := []string{}
for _, assetName := range assetNames {
if strings.HasPrefix(assetName, pathFilter) {
if strings.HasPrefix(assetName, filepath.Join(TemplatesDir, resourceDir)) {
filteredAssets = append(filteredAssets, assetName)
}
}
@@ -220,8 +219,8 @@ func templateResourceTf(templateName, resourceDir string, manifest *Manifest) er
for _, asset := range filteredAssets {
tfBytes := bindata.MustAsset(asset)
t := template.Must(template.New(templateName).Funcs(sprig.TxtFuncMap()).Parse(string(tfBytes)))
relativePath, err := filepath.Rel(TemplatesDir, asset)
tfOut, err := createFile(filepath.Dir(relativePath), filepath.Base(asset))
directoryPath := filepath.Dir(filepath.Join(destinationDir, strings.TrimPrefix(asset, filepath.Join(TemplatesDir, resourceDir))))
tfOut, err := createFile(directoryPath+"/", filepath.Base(asset))
if err != nil {
log.Fatalf("\nErr: %v", err)
return err

1
util.go
View File

@@ -22,7 +22,6 @@ func createFile(dir, fileName string) (*os.File, error) {
if err := os.Chmod(filePath, os.ModePerm); err != nil {
log.Fatalf("\nErr: %v", err)
}
return file, err
}