Skip to content

Commit

Permalink
add lifecycle test for read-only bindings [#154575192]
Browse files Browse the repository at this point in the history
  • Loading branch information
@pcf-core-services-writer
Alex Stupakov authored and pcf-core-services-writer committed Jan 30, 2018
1 parent d5d1323 commit 2712b21
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 59 deletions.
2 changes: 1 addition & 1 deletion cf-mysql-service/broker/broker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

var _ = Describe("P-MySQL Service broker", func() {
It("Registers a route", func() {
It("Denies access to the catalog endpoint when credentials are not provided", func() {
uri := fmt.Sprintf("%s://%s/v2/catalog", helpers.TestConfig.BrokerProtocol, helpers.TestConfig.BrokerHost)

fmt.Printf("\n*** Curling url: %s\n", uri)
Expand Down
183 changes: 125 additions & 58 deletions cf-mysql-service/lifecycle/lifecycle_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ var _ = Describe("P-MySQL Lifecycle Tests", func() {

var enableServiceAccessToOrg func(string, string)
var createBindAndStartApp func(string, string, string, string, helpers.Pinger)
var createServiceInstanceAndKey func(string, string, string, string, string) *Session
var cleanupServiceInstance func(string, string)
var cleanupServiceInstanceAndKey func(string, string)

It("Lists all public plans in cf marketplace", func() {
marketplaceCmd := cf.Cf("m").Wait(helpers.TestContext.LongTimeout())
Expand Down Expand Up @@ -51,90 +53,155 @@ var _ = Describe("P-MySQL Lifecycle Tests", func() {
}
})

Describe("When pushing an app", func() {
var appName, serviceInstanceName string
Describe("Bindings", func() {
var plan helpers.Plan
var sinatraAppClient helpers.SinatraAppClient
var cipherFinderAppClient helpers.CipherFinderClient

BeforeEach(func() {
appName = generator.PrefixedRandomName("lifecycle", "app")
serviceInstanceName = generator.PrefixedRandomName("lifecycle", "instance")

if len(helpers.TestConfig.Plans) > 0 {
plan = helpers.TestConfig.Plans[0]
} else {
Skip("Skipping due to lack of plans.")
}

enableServiceAccessToOrg(helpers.TestConfig.ServiceName, helpers.TestContext.RegularUserContext().Org)
sinatraAppClient = helpers.NewSinatraAppClient(helpers.TestConfig.AppURI(appName), serviceInstanceName, helpers.TestConfig.CFConfig.SkipSSLValidation)
cipherFinderAppClient = helpers.NewCipherFinderClient(helpers.TestConfig.AppURI(appName), helpers.TestConfig.CFConfig.SkipSSLValidation)
})

AfterEach(func() {
cleanupServiceInstance(appName, serviceInstanceName)
})
Describe("When pushing an app", func() {
var appName, serviceInstanceName string
var sinatraAppClient helpers.SinatraAppClient
var cipherFinderAppClient helpers.CipherFinderClient

BeforeEach(func() {
appName = generator.PrefixedRandomName("lifecycle", "app")
serviceInstanceName = generator.PrefixedRandomName("lifecycle", "instance")

sinatraAppClient = helpers.NewSinatraAppClient(helpers.TestConfig.AppURI(appName), serviceInstanceName, helpers.TestConfig.CFConfig.SkipSSLValidation)
cipherFinderAppClient = helpers.NewCipherFinderClient(helpers.TestConfig.AppURI(appName), helpers.TestConfig.CFConfig.SkipSSLValidation)
})

It("Allows users to create, bind, write to, read from, unbind, and destroy a service instance for the each plan", func() {
Expect(cf.Cf("push", appName, "-m", "256M", "-p", sinatraPath, "-b", "ruby_buildpack", "-d", helpers.TestConfig.CFConfig.AppsDomain, "--no-start").
Wait(helpers.TestContext.LongTimeout())).
To(Exit(0))
AfterEach(func() {
cleanupServiceInstance(appName, serviceInstanceName)
})

createBindAndStartApp(helpers.TestConfig.ServiceName, plan.Name, serviceInstanceName, appName, sinatraAppClient)
It("Allows users to create, bind, write to, read from, unbind, and destroy a service instance for the each plan", func() {
Expect(cf.Cf("push", appName, "-m", "256M", "-p", sinatraPath, "-b", "ruby_buildpack", "-d", helpers.TestConfig.CFConfig.AppsDomain, "--no-start").
Wait(helpers.TestContext.LongTimeout())).
To(Exit(0))

fmt.Printf("\n*** Posting to app\n")
msg, err := sinatraAppClient.Set("mykey", "myvalue")
Expect(err).NotTo(HaveOccurred())
Expect(msg).To(ContainSubstring("myvalue"))
createBindAndStartApp(helpers.TestConfig.ServiceName, plan.Name, serviceInstanceName, appName, sinatraAppClient)

fmt.Printf("\n*** Curling app\n")
msg, err = sinatraAppClient.Get("mykey")
Expect(msg).To(ContainSubstring("myvalue"))
Expect(err).NotTo(HaveOccurred())
})
fmt.Printf("\n*** Posting to app\n")
msg, err := sinatraAppClient.Set("mykey", "myvalue")
Expect(err).NotTo(HaveOccurred())
Expect(msg).To(ContainSubstring("myvalue"))

It("Guarantees a TLS connection to a simple Spring app", func() {
if !helpers.TestConfig.EnableTlsTests {
Skip("Skipping TLS tests as TLS is not enabled.")
}
fmt.Printf("\n*** Curling app\n")
msg, err = sinatraAppClient.Get("mykey")
Expect(msg).To(ContainSubstring("myvalue"))
Expect(err).NotTo(HaveOccurred())
})

It("Guarantees a TLS connection to a simple Spring app", func() {
if !helpers.TestConfig.EnableTlsTests {
Skip("Skipping TLS tests as TLS is not enabled.")
}

os.MkdirAll(fmt.Sprintf("%s/build/libs/", springPath), 0700)
os.Link("/var/vcap/packages/acceptance-tests/cipher_finder/cipher_finder.jar", fmt.Sprintf("%s/build/libs/cipher_finder.jar", springPath))

// cf push cipher-finder --no-start
Expect(cf.Cf("push", appName, "-m", "1G", "-f", fmt.Sprintf("%s/manifest.yml", springPath), "-d", helpers.TestConfig.CFConfig.AppsDomain, "--no-start").
Wait(helpers.TestContext.LongTimeout())).
To(Exit(0))

os.MkdirAll(fmt.Sprintf("%s/build/libs/", springPath), 0700)
os.Link("/var/vcap/packages/acceptance-tests/cipher_finder/cipher_finder.jar", fmt.Sprintf("%s/build/libs/cipher_finder.jar", springPath))
// create-service & bind-service & start & assertAppIsRunning
createBindAndStartApp(helpers.TestConfig.ServiceName, plan.Name, serviceInstanceName, appName, cipherFinderAppClient)

fmt.Printf("\n*** GET curl to url\n")
cipher, err := cipherFinderAppClient.Ciphers()
Expect(err).NotTo(HaveOccurred())
Expect(cipher).To(Equal("AES256-SHA256"))
})

enableServiceAccessToOrg = func(serviceName string, org string) {
workflowhelpers.AsUser(helpers.TestContext.AdminUserContext(), helpers.TestContext.ShortTimeout(), func() {
cf.Cf("enable-service-access", serviceName, "-o", org).Wait(helpers.TestContext.ShortTimeout())
})
}

// cf push cipher-finder --no-start
Expect(cf.Cf("push", appName, "-m", "1G", "-f", fmt.Sprintf("%s/manifest.yml", springPath), "-d", helpers.TestConfig.CFConfig.AppsDomain, "--no-start").
Wait(helpers.TestContext.LongTimeout())).
To(Exit(0))
createBindAndStartApp = func(serviceName string, planName string, serviceInstanceName string, appName string, appClient helpers.Pinger) {
Expect(cf.Cf("create-service", serviceName, planName, serviceInstanceName).Wait(helpers.TestContext.LongTimeout())).To(Exit(0))
Expect(cf.Cf("bind-service", appName, serviceInstanceName).Wait(helpers.TestContext.LongTimeout())).To(Exit(0))
Expect(cf.Cf("start", appName).Wait(helpers.TestContext.LongTimeout())).To(Exit(0))
err := appClient.Ping()
Expect(err).NotTo(HaveOccurred())
}

// create-service & bind-service & start & assertAppIsRunning
createBindAndStartApp(helpers.TestConfig.ServiceName, plan.Name, serviceInstanceName, appName, cipherFinderAppClient)
cleanupServiceInstance = func(appName string, serviceInstanceName string) {
cf.Cf("unbind-service", appName, serviceInstanceName).Wait(helpers.TestContext.LongTimeout())
Expect(cf.Cf("delete-service", "-f", serviceInstanceName).Wait(helpers.TestContext.LongTimeout())).To(Exit(0))

fmt.Printf("\n*** GET curl to url\n")
cipher, err := cipherFinderAppClient.Ciphers()
Expect(err).NotTo(HaveOccurred())
Expect(cipher).To(Equal("AES256-SHA256"))
Expect(cf.Cf("delete", appName, "-f").Wait(helpers.TestContext.LongTimeout())).To(Exit(0))
}
})

enableServiceAccessToOrg = func(serviceName string, org string) {
workflowhelpers.AsUser(helpers.TestContext.AdminUserContext(), helpers.TestContext.ShortTimeout(), func() {
cf.Cf("enable-service-access", serviceName, "-o", org).Wait(helpers.TestContext.ShortTimeout())
Describe("Creating a service key", func() {
var serviceInstanceName, serviceKeyName string

BeforeEach(func() {
serviceInstanceName = generator.PrefixedRandomName("lifecycle", "instance")
serviceKeyName = generator.PrefixedRandomName("lifecycle", "key")
})
}

createBindAndStartApp = func(serviceName string, planName string, serviceInstanceName string, appName string, appClient helpers.Pinger) {
Expect(cf.Cf("create-service", serviceName, planName, serviceInstanceName).Wait(helpers.TestContext.LongTimeout())).To(Exit(0))
Expect(cf.Cf("bind-service", appName, serviceInstanceName).Wait(helpers.TestContext.LongTimeout())).To(Exit(0))
Expect(cf.Cf("start", appName).Wait(helpers.TestContext.LongTimeout())).To(Exit(0))
err := appClient.Ping()
Expect(err).NotTo(HaveOccurred())
}
AfterEach(func() {
cleanupServiceInstanceAndKey(serviceInstanceName, serviceKeyName)
})

cleanupServiceInstance = func(appName string, serviceInstanceName string) {
cf.Cf("unbind-service", appName, serviceInstanceName).Wait(helpers.TestContext.LongTimeout())
cf.Cf("delete-service", "-f", serviceInstanceName).Wait(helpers.TestContext.LongTimeout())
Context("when no arbitrary parameters are provided", func() {
It("successfully creates a service key", func() {
createServiceInstanceAndKey(helpers.TestConfig.ServiceName, plan.Name, serviceInstanceName, serviceKeyName, "")
})
})

cf.Cf("delete", appName, "-f").Wait(helpers.TestContext.LongTimeout())
}
Context("when valid arbitrary parameters are provided", func() {
It("successfully creates a service key", func() {
arbitraryParams := `{"read-only":true}`
createServiceKeyCommand := createServiceInstanceAndKey(helpers.TestConfig.ServiceName, plan.Name, serviceInstanceName, serviceKeyName, arbitraryParams)
Expect(createServiceKeyCommand).To(Exit(0))
})
})

Context("when invalid arbitrary parameters are provided", func() {
Context("when the key is anything other than 'read-only'", func() {
It("fails to create a service key", func() {
arbitraryParams := `{"read_only":true}`
createServiceKeyCommand := createServiceInstanceAndKey(helpers.TestConfig.ServiceName, plan.Name, serviceInstanceName, serviceKeyName, arbitraryParams)
Expect(createServiceKeyCommand).To(Exit(1))
})
})

Context("when the value of 'read-only' is not the boolean value true", func() {
It("fails to create a service key", func() {
arbitraryParams := `{"read-only":"notboolean"}`
createServiceKeyCommand := createServiceInstanceAndKey(helpers.TestConfig.ServiceName, plan.Name, serviceInstanceName, serviceKeyName, arbitraryParams)
Expect(createServiceKeyCommand).To(Exit(1))
})
})
})

createServiceInstanceAndKey = func(serviceName, planName, serviceInstanceName, serviceKeyName, arbitraryParams string) *Session {
Expect(cf.Cf("create-service", serviceName, planName, serviceInstanceName).Wait(helpers.TestContext.LongTimeout())).To(Exit(0))
if arbitraryParams == "" {
return cf.Cf("create-service-key", serviceInstanceName, serviceKeyName).Wait(helpers.TestContext.LongTimeout())
} else {
return cf.Cf("create-service-key", serviceInstanceName, serviceKeyName, "-c", arbitraryParams).Wait(helpers.TestContext.LongTimeout())
}
}

cleanupServiceInstanceAndKey = func(serviceInstanceName, serviceKeyName string) {
Expect(cf.Cf("delete-service-key", "-f", serviceInstanceName, serviceKeyName).Wait(helpers.TestContext.LongTimeout())).To(Exit(0))
Expect(cf.Cf("delete-service", "-f", serviceInstanceName).Wait(helpers.TestContext.LongTimeout())).To(Exit(0))
}
})
})
})

0 comments on commit 2712b21

Please sign in to comment.