Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor!: Namegenerator functions refactor #12

Merged
merged 7 commits into from
Sep 25, 2023
Merged

refactor!: Namegenerator functions refactor #12

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4f9d4d
Refactored name generator function
horiagunica Sep 19, 2023
dcd19e1
Merge branch 'main' into namegenerator-functions-refactor
horiagunica Sep 19, 2023
8366b06
Update pkg/testskeleton/testskeleton.go
horiagunica Sep 20, 2023
eab5472
Update pkg/testskeleton/testskeleton.go
horiagunica Sep 20, 2023
0c770d8
Changed some names
horiagunica Sep 20, 2023
af1b070
Refactored GenerateTerraformVarsInfo function with cloud input
horiagunica Sep 21, 2023
413e7c8
Refactored GenerateTerraformVarsInfo function with cloud input
horiagunica Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 15 additions & 36 deletions pkg/testskeleton/testskeleton.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,47 +58,25 @@ type AdditionalChangesAfterDeployment struct {
ChangedResources []ChangedResource
}

// Structure used for AWS deployments - contains randomly generated resource names.
type AwsRandomNames struct {
NamePrefix string
// Structure used for terraform tfvars input information,
// not all options are used in all public cloud environments
type TerraformVarsInfo struct {
NamePrefix string
AzureResourceGroupName string
AzureStorageAccountName string
GoogleProjectId string
}

// Function that generates and returns a set of random AWS resource names.
// Randomization is based on UUID.
func GenerateAwRandomNames() AwsRandomNames {
// Function that generates and returns information used by Terraform TFVARS.
func GenerateTerraformVarsInfo() TerraformVarsInfo {
prid := os.Getenv("PRID")
if prid != "" {
prid = fmt.Sprintf("p%s", prid)
} else {
prid = "tt"
}

id := uuid.New().String()
idSliced := strings.Split(id, "-")

prefixId := idSliced[2]

names := AwsRandomNames{
NamePrefix: fmt.Sprintf("%s-%s-", prid, prefixId),
}

return names
}

// Structure used for Azure deployments - contains randomly generated resource names.
type AzureRandomNames struct {
NamePrefix string
ResourceGroupName string
StorageAccountName string
}

// Function that generates and returns a set of random Azure resource names.
// Randomization is based on UUID.
func GenerateAzureRandomNames() AzureRandomNames {
prid := os.Getenv("PRID")
if prid != "" {
prid = fmt.Sprintf("-pr%s-", prid)
}
projectId := os.Getenv("PROJECT_ID")

id := uuid.New().String()
idSliced := strings.Split(id, "-")
Expand All @@ -107,10 +85,11 @@ func GenerateAzureRandomNames() AzureRandomNames {
gid := idSliced[0:2]
storageId := idSliced[3:5]

names := AzureRandomNames{
NamePrefix: fmt.Sprintf("ghci%s%s-", prid, prefixId),
ResourceGroupName: strings.Join(gid, ""),
StorageAccountName: fmt.Sprintf("ghci%s", strings.Join(storageId, "")),
names := TerraformVarsInfo{
NamePrefix: fmt.Sprintf("%s-%s-", prid, prefixId),
AzureResourceGroupName: strings.Join(gid, ""),
AzureStorageAccountName: fmt.Sprintf("ghci%s", strings.Join(storageId, "")),
GoogleProjectId: projectId,
}

return names
Expand Down