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

Jump to bottom

Add volume services support #26

Merged
merged 2 commits into from
Jul 5, 2018
Merged

Add volume services support #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b80cc9
Add volume services support
vChrisR Jun 4, 2018
e446805
rename volume_mounts to VoluemMounts and use mapstructure tag
vChrisR Jun 4, 2018
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
14 changes: 8 additions & 6 deletions cfenv_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var _ = Describe("Cfenv", func() {
`PWD=/home/vcap`,
`TMPDIR=/home/vcap/tmp`,
`USER=vcap`,
`VCAP_SERVICES={"elephantsql-dev":[{"name":"elephantsql-dev-c6c60","label":"elephantsql-dev","tags":["New Product","relational","Data Store","postgresql"],"plan":"turtle","credentials":{"uri":"postgres://seilbmbd:PHxTPJSbkcDakfK4cYwXHiIX9Q8p5Bxn@babar.elephantsql.com:5432/seilbmbd"}}],"sendgrid":[{"name":"mysendgrid","label":"sendgrid","tags":["smtp","Email"],"plan":"free","credentials":{"hostname":"smtp.sendgrid.net","username":"QvsXMbJ3rK","password":"HCHMOYluTv"}}]}`,
`VCAP_SERVICES={"elephantsql-dev":[{"name":"elephantsql-dev-c6c60","label":"elephantsql-dev","tags":["New Product","relational","Data Store","postgresql"],"plan":"turtle","credentials":{"uri":"postgres://seilbmbd:PHxTPJSbkcDakfK4cYwXHiIX9Q8p5Bxn@babar.elephantsql.com:5432/seilbmbd"}}],"sendgrid":[{"name":"mysendgrid","label":"sendgrid","tags":["smtp","Email"],"plan":"free","credentials":{"hostname":"smtp.sendgrid.net","username":"QvsXMbJ3rK","password":"HCHMOYluTv"}}],"nfs":[{"credentials":{},"label":"nfs","name":"nfs","plan":"Existing","tags":["nfs"],"volume_mounts":[{"container_dir":"/testpath","device_type":"shared","mode":"rw"}]}]}`,
}

validEnvWithoutSpaceIDAndName := []string{
Expand Down Expand Up @@ -73,7 +73,7 @@ var _ = Describe("Cfenv", func() {
`PORT=1234`,
`TMPDIR=/home/vcap/tmp`,
`USER=vcap`,
`VCAP_SERVICES={"elephantsql-dev":[{"name":"","label":"elephantsql-dev","plan":"turtle","credentials":{"uri":"postgres://seilbmbd:PHxTPJSbkcDakfK4cYwXHiIX9Q8p5Bxn@babar.elephantsql.com:5432/seilbmbd"}}],"sendgrid":[{"name":"mysendgrid","label":"sendgrid","plan":"free","credentials":{"hostname":"smtp.sendgrid.net","username":"QvsXMbJ3rK","password":"HCHMOYluTv"}}]}`,
`VCAP_SERVICES={"elephantsql-dev":[{"name":"","label":"elephantsql-dev","plan":"turtle","credentials":{"uri":"postgres://seilbmbd:PHxTPJSbkcDakfK4cYwXHiIX9Q8p5Bxn@babar.elephantsql.com:5432/seilbmbd"}}],"sendgrid":[{"name":"mysendgrid","label":"sendgrid","plan":"free","credentials":{"hostname":"smtp.sendgrid.net","username":"QvsXMbJ3rK","password":"HCHMOYluTv"}}],"nfs":[{"credentials":{},"label":"nfs","name":"nfsexport","plan":"Existing","volume_mounts":[{"container_dir":"/testpath","device_type":"shared","mode":"rw"}]}]}`,
}

Context("When not running on Cloud Foundry", func() {
Expand Down Expand Up @@ -127,7 +127,7 @@ var _ = Describe("Cfenv", func() {
Ω(cfenv.Limits.Mem).Should(BeEquivalentTo(512))
Ω(cfenv.Limits.FDs).Should(BeEquivalentTo(16384))
Ω(cfenv.ApplicationURIs[0]).Should(BeEquivalentTo("styx-james.a1-app.cf-app.com"))
Ω(len(cfenv.Services)).Should(BeEquivalentTo(2))
Ω(len(cfenv.Services)).Should(BeEquivalentTo(3))
Ω(cfenv.Services["elephantsql-dev"][0].Name).Should(BeEquivalentTo("elephantsql-dev-c6c60"))
Ω(cfenv.Services["elephantsql-dev"][0].Label).Should(BeEquivalentTo("elephantsql-dev"))
Ω(cfenv.Services["elephantsql-dev"][0].Tags).Should(BeEquivalentTo([]string{"New Product", "relational", "Data Store", "postgresql"}))
Expand All @@ -143,6 +143,8 @@ var _ = Describe("Cfenv", func() {
Ω(cfenv.Services["sendgrid"][0].Credentials["username"]).Should(BeEquivalentTo("QvsXMbJ3rK"))
Ω(cfenv.Services["sendgrid"][0].Credentials["password"]).Should(BeEquivalentTo("HCHMOYluTv"))

Ω(cfenv.Services["nfs"][0].VolumeMounts[0]["container_dir"]).Should(BeEquivalentTo("/testpath"))

name, err := cfenv.Services.WithName("elephantsql-dev-c6c60")
Ω(name.Name).Should(BeEquivalentTo("elephantsql-dev-c6c60"))
Ω(err).Should(BeNil())
Expand All @@ -168,12 +170,12 @@ var _ = Describe("Cfenv", func() {
}
Ω(isValidNames).Should(BeTrue(), "Not valid names when finding by regex")

tags, err := cfenv.Services.WithTagUsingPattern(".*s.*")
Ω(len(tags)).Should(BeEquivalentTo(2))
tags, err := cfenv.Services.WithTagUsingPattern(".*sql.*")
Ω(len(tags)).Should(BeEquivalentTo(1))
Ω(err).Should(BeNil())
isValidTags := true
for _, service := range tags {
if service.Name != "mysendgrid" && service.Name != "elephantsql-dev-c6c60" {
if service.Name != "elephantsql-dev-c6c60" {
isValidTags = false
}
}
Expand Down
11 changes: 6 additions & 5 deletions service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ import (
// service object contains a child object for each service instance of that
// service that is bound to the application.
type Service struct {
Name string // name of the service
Label string // label of the service
Tags []string // tags for the service
Plan string // plan of the service
Credentials map[string]interface{} // credentials for the service
Name string // name of the service
Label string // label of the service
Tags []string // tags for the service
Plan string // plan of the service
Credentials map[string]interface{} // credentials for the service
VolumeMounts []map[string]string `mapstructure:"volume_mounts"` // volume mount info as provided by the nfsbroker
}

func (s *Service) CredentialString(key string) (string, bool) {
Expand Down