From ffa0d8165cda2449dd8648b9a9a1fde5bc41ef73 Mon Sep 17 00:00:00 2001 From: Harry Metske Date: Wed, 25 Sep 2024 18:40:26 +0200 Subject: [PATCH] cleanup --- resources/testing/README.md | 3 - resources/testing/delete-apps.sh | 26 ------ resources/testing/deploy-test-apps/deploy.sh | 33 ------- resources/testing/panzer-config-test/main.go | 87 ------------------- .../panzer-config-test/model/models.go | 14 --- 5 files changed, 163 deletions(-) delete mode 100644 resources/testing/README.md delete mode 100755 resources/testing/delete-apps.sh delete mode 100755 resources/testing/deploy-test-apps/deploy.sh delete mode 100644 resources/testing/panzer-config-test/main.go delete mode 100644 resources/testing/panzer-config-test/model/models.go diff --git a/resources/testing/README.md b/resources/testing/README.md deleted file mode 100644 index 86d2e63..0000000 --- a/resources/testing/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## Setting up tests - -We try to create the situation depicted here: https://confluence.dev.rabobank.nl/pages/viewpage.action?pageId=1071746417#HowtohandleCFnetworkpolicies-Variant2,indirectrelationsbetweenapps diff --git a/resources/testing/delete-apps.sh b/resources/testing/delete-apps.sh deleted file mode 100755 index 64f29ff..0000000 --- a/resources/testing/delete-apps.sh +++ /dev/null @@ -1,26 +0,0 @@ -set -eu -cf t -o it4it-org -s spaceA -for A in appA appB appC -do - cf delete -f -r "$A" -done -cf t -o it4it-org -s spaceB -for A in appD appE -do - cf delete -f -r "$A" -done -cf t -o it4it-org -s spaceC -for A in appF appG appH -do - cf delete -f -r "$A" -done -cf t -o it4it-org -s spaceD -for A in appI appJ -do - cf delete -f -r "$A" -done -cf t -o it4it-org -s spaceE -for A in appL appM appN appO -do - cf delete -f -r "$A" -done diff --git a/resources/testing/deploy-test-apps/deploy.sh b/resources/testing/deploy-test-apps/deploy.sh deleted file mode 100755 index c0b95eb..0000000 --- a/resources/testing/deploy-test-apps/deploy.sh +++ /dev/null @@ -1,33 +0,0 @@ -set -eu -cf t -o it4it-org -s spaceA -for A in appA appB appC -do - cf push -f cf-statics/manifest.yml -p cf-statics "$A" --no-start -done -cf t -o it4it-org -s spaceB -for A in appD appE -do - cf push -f cf-statics/manifest.yml -p cf-statics "$A" --no-start - cf map-route "$A" apps.internal --hostname "$A" -done -cf t -o it4it-org -s spaceC -for A in appF appG appH -do - cf push -f cf-statics/manifest.yml -p cf-statics "$A" --no-start -done -cf t -o it4it-org -s spaceD -for A in appI appJ -do - cf push -f cf-statics/manifest.yml -p cf-statics "$A" --no-start - cf map-route "$A" apps.internal --hostname "$A" -done -cf t -o it4it-org -s spaceE -for A in appL appM -do - cf push -f cf-statics/manifest.yml -p cf-statics "$A" --no-start -done -for A in appN appO -do - cf push -f cf-statics/manifest.yml -p cf-statics "$A" --no-start - cf map-route "$A" apps.internal --hostname "$A" -done diff --git a/resources/testing/panzer-config-test/main.go b/resources/testing/panzer-config-test/main.go deleted file mode 100644 index fb837f5..0000000 --- a/resources/testing/panzer-config-test/main.go +++ /dev/null @@ -1,87 +0,0 @@ -package main - -import ( - "bufio" - "bytes" - "fmt" - "github.com/rabobank/npsb/resources/testing/panzer-config-test/model" - "gopkg.in/yaml.v3" - "os" - "path/filepath" - "strings" -) - -var ( - createBuffer bytes.Buffer - deleteBuffer bytes.Buffer -) - -func main() { - if len(os.Args) < 2 { - fmt.Println("Usage: org-spaces-info ") - os.Exit(1) - } - directory := os.Args[1] - fmt.Printf("# Directory: %s\n", directory) - - if err := filepath.Walk(directory, generateCreateAndBinds); err != nil { - fmt.Println(err) - } - fmt.Println(createBuffer.String()) - _, _ = os.Stderr.WriteString(deleteBuffer.String()) -} - -func generateCreateAndBinds(fullPath string, info os.FileInfo, err error) error { - if err == nil && info.Name() == "network-policies.yml" { - var file *os.File - if file, err = os.Open(fullPath); err != nil { - fmt.Printf("%s could not be opened: %s\n", fullPath, err) - return nil - } else { - defer func() { _ = file.Close() }() - decoder := yaml.NewDecoder(bufio.NewReader(file)) - decoder.KnownFields(true) - spaceConfig := model.SpacePolicies{} - if err = decoder.Decode(&spaceConfig); err != nil { - fmt.Printf("%s could not be parsed: %s\n", fullPath, err) - } else { - pieces := strings.Split(fullPath, "/") - orgName := pieces[len(pieces)-3] - spaceName := pieces[len(pieces)-2] - createBuffer.WriteString(fmt.Sprintf("\ncf t -o %s -s %s\n", orgName, spaceName)) - deleteBuffer.WriteString(fmt.Sprintf("\ncf t -o %s -s %s\n", orgName, spaceName)) - for targetIndex, target := range spaceConfig.Targets { - for fromIndex, from := range target.From { - if from.Org == "" && from.Space == "" { - createBuffer.WriteString(fmt.Sprintf(" cf cs network-policies default src%d-%d -c '{\"type\":\"source\",\"name\":\"%s-src%d-%d\",\"scope\":\"local\",\"description\":\"doe iets leuks\"}'\n", targetIndex, fromIndex, spaceName, targetIndex, fromIndex)) - deleteBuffer.WriteString(fmt.Sprintf(" cf ds -f src%d-%d\n", targetIndex, fromIndex)) - for _, fromApp := range from.Apps { - createBuffer.WriteString(fmt.Sprintf(" cf push -f ../deploy-test-apps/cf-statics/manifest.yml -p ../deploy-test-apps/cf-statics \"%s\"\n", fromApp)) - //createBuffer.WriteString(fmt.Sprintf(" cf push -f ../deploy-test-apps/cf-statics/manifest.yml -p ../deploy-test-apps/cf-statics \"%s\" --no-start\n", fromApp)) - deleteBuffer.WriteString(fmt.Sprintf(" cf d -f -r \"%s\"\n", fromApp)) - createBuffer.WriteString(fmt.Sprintf(" cf map-route \"%s\" apps.internal --hostname \"%s\"\n", fromApp, fromApp)) - createBuffer.WriteString(fmt.Sprintf(" cf bs %s src%d-%d\n", fromApp, targetIndex, fromIndex)) - } - } - } - for _, targetApp := range target.Apps { - createBuffer.WriteString(fmt.Sprintf(" cf push -f ../deploy-test-apps/cf-statics/manifest.yml -p ../deploy-test-apps/cf-statics \"%s\"\n", targetApp)) - //createBuffer.WriteString(fmt.Sprintf(" cf push -f ../deploy-test-apps/cf-statics/manifest.yml -p ../deploy-test-apps/cf-statics \"%s\" --no-start\n", targetApp)) - deleteBuffer.WriteString(fmt.Sprintf(" cf d -f -r \"%s\"\n", targetApp)) - createBuffer.WriteString(fmt.Sprintf(" cf map-route \"%s\" apps.internal --hostname \"%s\"\n", targetApp, targetApp)) - for fromIndex := range target.From { - createBuffer.WriteString(fmt.Sprintf(" cf cs network-policies default dest%d-%d -c '{\"type\":\"destination\",\"source\":\"%s-src%d-%d\"}'\n", targetIndex, fromIndex, spaceName, targetIndex, fromIndex)) - deleteBuffer.WriteString(fmt.Sprintf(" cf ds -f dest%d-%d\n", targetIndex, fromIndex)) - if target.Port == 0 { - createBuffer.WriteString(fmt.Sprintf(" cf bs %s dest%d-%d\n", targetApp, targetIndex, fromIndex)) - } else { - createBuffer.WriteString(fmt.Sprintf(" cf bs %s dest%d-%d -c '{\"port\":%d}'\n", targetApp, targetIndex, fromIndex, target.Port)) - } - } - } - } - } - } - } - return nil -} diff --git a/resources/testing/panzer-config-test/model/models.go b/resources/testing/panzer-config-test/model/models.go deleted file mode 100644 index c74b9d4..0000000 --- a/resources/testing/panzer-config-test/model/models.go +++ /dev/null @@ -1,14 +0,0 @@ -package model - -type SpacePolicies struct { - Targets []struct { - Apps []string `yaml:"apps"` - Port int `yaml:"port"` - Protocol string `yaml:"protocol"` - From []struct { - Org string `yaml:"org"` - Space string `yaml:"space"` - Apps []string `yaml:"apps"` - } `yaml:"from"` - } `yaml:"targets"` -}