Skip to content

Commit

Permalink
wip: add ssh
Browse files Browse the repository at this point in the history
  • Loading branch information
domdom82 committed Jun 22, 2023
1 parent bdd887d commit 217858a
Show file tree
Hide file tree
Showing 5 changed files with 354 additions and 16 deletions.
13 changes: 10 additions & 3 deletions acceptance-tests/basic_pcap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ package acceptance_tests

import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"os/exec"
)

var _ = Describe("Pcap API Deployment", func() {
It("Responds to basic requests", func() {
var _ = Describe("Pcap Deployment", func() {
It("Deploys successfully", func() {

deployPcap(
info, _ := deployPcap(
baseManifestVars{
deploymentName: deploymentNameForTestNode(),
},
Expand All @@ -16,5 +18,10 @@ var _ = Describe("Pcap API Deployment", func() {
true,
)

err := downloadFile(info, "/var/vcap/packages/pcap-api/bin/cli/build/pcap-bosh-cli-linux-amd64", "/usr/local/bin/pcap-bosh-cli", 0755)
Expect(err).NotTo(HaveOccurred())

exec.Command("pcap-bosh-cli", "--help")

})
})
99 changes: 92 additions & 7 deletions acceptance-tests/bosh_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ import (
"gopkg.in/yaml.v3"
)

type pcapAPIInfo struct {
SSHPrivateKey string
SSHPublicKey string
SSHPublicKeyFingerprint string
SSHUser string
PublicIP string
}

type baseManifestVars struct {
deploymentName string
}
Expand All @@ -38,8 +46,37 @@ var opsfileChangeVersion string = `---
version: ((release-version))
`

var opsfileAddSSHUser string = `---
# Install OS conf so that we can SSH into VM to inspect configuration
- type: replace
path: /releases/-
value:
name: os-conf
version: latest
# Add an SSH user
- type: replace
path: /instance_groups/name=pcap-api/jobs/-
value:
name: user_add
release: os-conf
properties:
users:
- name: ((ssh_user))
public_key: ((ssh_key.public_key))
sudo: true
# Generate an SSH key-pair
- type: replace
path: /variables?/-
value:
name: ssh_key
type: ssh
`

// opsfiles that need to be set for all tests
var defaultOpsfiles = []string{opsfileChangeName, opsfileChangeVersion}
var defaultOpsfiles = []string{opsfileChangeName, opsfileChangeVersion, opsfileAddSSHUser}
var defaultSSHUser string = "ginkgo"

func buildManifestVars(baseManifestVars baseManifestVars, customVars map[string]interface{}) map[string]interface{} {
vars := map[string]interface{}{
Expand All @@ -57,16 +94,38 @@ func buildManifestVars(baseManifestVars baseManifestVars, customVars map[string]
return vars
}

func dumpCmd(cmd *exec.Cmd) {
writeLog("---------- Command to run ----------")
writeLog(cmd.String())
writeLog("------------------------------------")
func buildPcapAPIInfo(baseManifestVars baseManifestVars, varsStoreReader varsStoreReader) pcapAPIInfo {
var creds struct {
SSHKey struct {
PrivateKey string `yaml:"private_key"`
PublicKey string `yaml:"public_key"`
PublicKeyFingerprint string `yaml:"public_key_fingerprint"`
} `yaml:"ssh_key"`
}
err := varsStoreReader(&creds)
Expect(err).NotTo(HaveOccurred())

Expect(creds.SSHKey.PrivateKey).NotTo(BeEmpty())
Expect(creds.SSHKey.PublicKey).NotTo(BeEmpty())

By("Fetching the PcapAPI public IP")
instances := boshInstances(baseManifestVars.deploymentName)
pcapAPIPublicIP := instances[0].ParseIPs()[0]
Expect(pcapAPIPublicIP).ToNot(BeEmpty())

return pcapAPIInfo{
PublicIP: pcapAPIPublicIP,
SSHPrivateKey: creds.SSHKey.PrivateKey,
SSHPublicKey: creds.SSHKey.PublicKey,
SSHPublicKeyFingerprint: creds.SSHKey.PublicKeyFingerprint,
SSHUser: defaultSSHUser,
}
}

func deployPcap(baseManifestVars baseManifestVars, customOpsfiles []string, customVars map[string]interface{}, expectSuccess bool) {
func deployPcap(baseManifestVars baseManifestVars, customOpsfiles []string, customVars map[string]interface{}, expectSuccess bool) (pcapAPIInfo, varsStoreReader) {
manifestVars := buildManifestVars(baseManifestVars, customVars)
opsfiles := append(defaultOpsfiles, customOpsfiles...)
cmd, _ := deployBaseManifestCmd(baseManifestVars.deploymentName, opsfiles, manifestVars)
cmd, varsStoreReader := deployBaseManifestCmd(baseManifestVars.deploymentName, opsfiles, manifestVars)

dumpCmd(cmd)
session, err := gexec.Start(cmd, GinkgoWriter, GinkgoWriter)
Expand All @@ -79,6 +138,28 @@ func deployPcap(baseManifestVars baseManifestVars, customOpsfiles []string, cust
Eventually(session, timeout*time.Minute, time.Second).Should(gexec.Exit())
Expect(session.ExitCode()).NotTo(BeZero())
}

pcapAPIInfo := buildPcapAPIInfo(baseManifestVars, varsStoreReader)

// Dump Pcap API config to help debugging
dumpPcapAPIConfig(pcapAPIInfo)

return pcapAPIInfo, varsStoreReader
}

func dumpCmd(cmd *exec.Cmd) {
writeLog("---------- Command to run ----------")
writeLog(cmd.String())
writeLog("------------------------------------")
}

func dumpPcapAPIConfig(pcapAPIInfo pcapAPIInfo) {
By("Checking /var/vcap/jobs/pcap-api/config/pcap-api.yml")
pcapAPIConfig, _, err := runOnRemote(pcapAPIInfo.SSHUser, pcapAPIInfo.PublicIP, pcapAPIInfo.SSHPrivateKey, "cat /var/vcap/jobs/pcap-api/config/pcap-api.yml")
Expect(err).NotTo(HaveOccurred())
writeLog("---------- PcapAPI Config ----------")
writeLog(pcapAPIConfig)
writeLog("------------------------------------")
}

// Takes bosh deployment name, ops files and vars.
Expand Down Expand Up @@ -204,3 +285,7 @@ func writeLog(s string) {
fmt.Printf("node %d/%d: %s\n", ginkgoConfig.ParallelProcess, ginkgoConfig.ParallelTotal, line)
}
}

func downloadFile(info pcapAPIInfo, remotePath, localPath string, permissions os.FileMode) error {
return copyFileFromRemote(info.SSHUser, info.PublicIP, info.SSHPrivateKey, "/var/vcap/packages/pcap-api/bin/cli/build/pcap-bosh-cli-linux-amd64", "/usr/local/bin/pcap-bosh-cli", 0755)
}
6 changes: 4 additions & 2 deletions acceptance-tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ module acceptance_tests
go 1.20

require (
github.com/bramvdbogaerde/go-scp v1.2.1
github.com/onsi/ginkgo/v2 v2.9.7
github.com/onsi/gomega v1.27.7
golang.org/x/crypto v0.10.0
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -14,7 +16,7 @@ require (
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/tools v0.9.1 // indirect
)
20 changes: 16 additions & 4 deletions acceptance-tests/go.sum
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
github.com/bramvdbogaerde/go-scp v1.2.1 h1:BKTqrqXiQYovrDlfuVFaEGz0r4Ou6EED8L7jCXw6Buw=
github.com/bramvdbogaerde/go-scp v1.2.1/go.mod h1:s4ZldBoRAOgUg8IrRP2Urmq5qqd2yPXQTPshACY8vQ0=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
Expand All @@ -23,14 +25,24 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
Expand Down
Loading

0 comments on commit 217858a

Please sign in to comment.