Skip to content

fix: use schematics for admin pass #393

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

Closed
wants to merge 7 commits into from
Closed

fix: use schematics for admin pass #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9d689c2
fix: use schematics for admin pass
Feb 6, 2025
e53c650
Merge branch 'main' into fix-admin-pass
jor2 Feb 12, 2025
f23426e
fix: update tests
Feb 12, 2025
39e6fc1
fix: update tests
Feb 12, 2025
f4fdb57
fix: tests
Feb 13, 2025
7175ee9
Merge branch 'main' into fix-admin-pass
jor2 Feb 14, 2025
b5963d5
fix: pre-commit
Feb 14, 2025
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
2 changes: 1 addition & 1 deletion .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"hashed_secret": "33da8d0e8af2efc260f01d8e5edfcc5c5aba44ad",
"is_secret": true,
"is_verified": false,
"line_number": 35,
"line_number": 36,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
2 changes: 1 addition & 1 deletion common-dev-assets
Open in desktop
Submodule common-dev-assets updated 6 files
+3 −0 common-go-assets/common-permanent-resources.yaml
+1 −1 examples/Dockerfile
+2 −2 module-assets/.pre-commit-config.yaml
+6 −6 module-assets/ci/install-deps.sh
+1 −1 stack-assets/.pre-commit-config.yaml
+1 −1 stack-assets/stack-updater/requirements.txt
21 changes: 19 additions & 2 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
package test

import (
"crypto/rand"
"encoding/base64"
"fmt"
"log"
"math/rand"
"math/big"
"os"
"strings"
"testing"
Expand Down Expand Up @@ -109,6 +111,7 @@ func TestRunStandardSolutionSchematics(t *testing.T) {
{Name: "enable_kibana_dashboard", Value: true, DataType: "bool"},
{Name: "provider_visibility", Value: "private", DataType: "string"},
{Name: "prefix", Value: options.Prefix, DataType: "string"},
{Name: "admin_pass", Value: GetRandomAdminPassword(t), DataType: "string"},
}
err := options.RunSchematicTest()
assert.Nil(t, err, "This should not have errored")
Expand Down Expand Up @@ -150,7 +153,12 @@ func TestRunExistingInstance(t *testing.T) {
prefix := fmt.Sprintf("elastic-t-%s", strings.ToLower(random.UniqueId()))
realTerraformDir := ".."
tempTerraformDir, _ := files.CopyTerraformFolderToTemp(realTerraformDir, fmt.Sprintf(prefix+"-%s", strings.ToLower(random.UniqueId())))
region := validICDRegions[rand.Intn(len(validICDRegions))]

nBig, err := rand.Int(rand.Reader, big.NewInt(int64(len(validICDRegions))))
if err != nil {
panic(err)
}
region := validICDRegions[nBig.Int64()]

// Verify ibmcloud_api_key variable is set
checkVariable := "TF_VAR_ibmcloud_api_key"
Expand Down Expand Up @@ -243,3 +251,12 @@ func TestRunStandardSolutionIBMKeys(t *testing.T) {
assert.Nil(t, err, "This should not have errored")
assert.NotNil(t, output, "Expected some output")
}

func GetRandomAdminPassword(t *testing.T) string {
// Generate a 15 char long random string for the admin_pass
randomBytes := make([]byte, 13)
_, randErr := rand.Read(randomBytes)
require.Nil(t, randErr) // do not proceed if we can't gen a random password
randomPass := "A1" + base64.URLEncoding.EncodeToString(randomBytes)[:13]
return randomPass
}