Merge pull request #650 from cloudfoundry/r_and_nginx_bp_tests

Additional tests for r_buildpack and nginx_buildpack
cloudfoundry · Dec 1, 2022 · c7ece41 · c7ece41
2 parents ac7eda3 + 04b31a5
commit c7ece41
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -175,10 +175,12 @@ include_v3
 * `staticfile_buildpack_name` [See below](#buildpack-names)
 * `java_buildpack_name` [See below](#buildpack-names)
 * `ruby_buildpack_name` [See below](#buildpack-names)
+* `nginx_buildpack_name` [See below](#buildpack-names)
 * `nodejs_buildpack_name` [See below](#buildpack-names)
 * `go_buildpack_name` [See below](#buildpack-names)
 * `python_buildpack_name` [See below](#buildpack-names)
 * `php_buildpack_name` [See below](#buildpack-names)
+* `r_buildpack_name` [See below](#buildpack-names)
 * `binary_buildpack_name` [See below](#buildpack-names)
 
 * `include_windows`: Flag to include the tests that run against Windows cells.
@@ -202,10 +204,12 @@ Many tests specify a buildpack when pushing an app, so that on diego the app sta
 * `staticfile_buildpack_name: staticfile_buildpack`
 * `java_buildpack_name: java_buildpack`
 * `ruby_buildpack_name: ruby_buildpack`
+* `nginx_buildpack_name: nginx_buildpack`
 * `nodejs_buildpack_name: nodejs_buildpack`
 * `go_buildpack_name: go_buildpack`
 * `python_buildpack_name: python_buildpack`
 * `php_buildpack_name: php_buildpack`
+* `r_buildpack_name: r_buildpack`
 * `binary_buildpack_name: binary_buildpack`
 * `hwc_buildpack_name: hwc_buildpack`
 

diff --git a/assets/nginx/nginx.conf b/assets/nginx/nginx.conf
@@ -0,0 +1,13 @@
+events {
+   worker_connections  1024;
+}
+
+http {
+   server {
+       listen {{port}};
+
+       location = / {
+            return 200 "Hello NGINX!";
+       }
+   }
+}
diff --git a/assets/r/Procfile b/assets/r/Procfile
@@ -0,0 +1 @@
+web: R -f simple.r
diff --git a/assets/r/r.yml b/assets/r/r.yml
diff --git a/assets/r/simple.r b/assets/r/simple.r
@@ -0,0 +1,14 @@
+library(shiny)
+
+# Define the UI
+ui <- fluidPage(
+  titlePanel("Hello R!")
+)
+
+# Define the server code
+server <- function(input, output) {
+}
+
+# Return a Shiny app object
+options(shiny.port = strtoi(Sys.getenv("PORT")), shiny.host = "0.0.0.0")
+shinyApp(ui = ui, server = server)
diff --git a/detect/buildpacks.go b/detect/buildpacks.go
@@ -33,6 +33,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("ruby", func() {
 		for _, stack := range Config.GetStacks() {
+			stack := stack
 			Context(fmt.Sprintf("when using %s stack", stack), func() {
 				It("makes the app reachable via its bound route", func() {
 					Expect(cf.Cf("push",
@@ -52,6 +53,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("node", func() {
 		for _, stack := range Config.GetStacks() {
+			stack := stack
 			Context(fmt.Sprintf("when using %s stack", stack), func() {
 				It("makes the app reachable via its bound route", func() {
 					Expect(cf.Cf("push",
@@ -71,6 +73,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("java", func() {
 		for _, stack := range Config.GetStacks() {
+			stack := stack
 			Context(fmt.Sprintf("when using %s stack", stack), func() {
 				It("makes the app reachable via its bound route", func() {
 					Expect(cf.Cf("push", appName,
@@ -90,6 +93,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("golang", func() {
 		for _, stack := range Config.GetStacks() {
+			stack := stack
 			Context(fmt.Sprintf("when using %s stack", stack), func() {
 				It("makes the app reachable via its bound route", func() {
 					Expect(cf.Cf("push", appName,
@@ -109,6 +113,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("python", func() {
 		for _, stack := range Config.GetStacks() {
+			stack := stack
 			Context(fmt.Sprintf("when using %s stack", stack), func() {
 				It("makes the app reachable via its bound route", func() {
 					Expect(cf.Cf("push", appName,
@@ -134,6 +139,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 		})
 
 		for _, stack := range Config.GetStacks() {
+			stack := stack
 			Context(fmt.Sprintf("when using %s stack", stack), func() {
 				It("makes the app reachable via its bound route", func() {
 					Expect(cf.Cf("push", appName,
@@ -170,6 +176,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 	Describe("staticfile", func() {
 		SkipOnK8s("staticfile not yet supported, as currently structured in CATS")
 		for _, stack := range Config.GetStacks() {
+			stack := stack
 			Context(fmt.Sprintf("when using %s stack", stack), func() {
 				It("makes the app reachable via its bound route", func() {
 					Expect(cf.Cf("push", appName,
@@ -188,6 +195,7 @@ var _ = DetectDescribe("Buildpacks", func() {
 
 	Describe("binary", func() {
 		for _, stack := range Config.GetStacks() {
+			stack := stack
 			Context(fmt.Sprintf("when using %s stack", stack), func() {
 				It("makes the app reachable via its bound route", func() {
 					Expect(cf.Cf("push", appName,
@@ -204,4 +212,42 @@ var _ = DetectDescribe("Buildpacks", func() {
 			})
 		}
 	})
+
+	Describe("nginx", func() {
+		for _, stack := range Config.GetStacks() {
+			stack := stack
+			Context(fmt.Sprintf("when using %s stack", stack), func() {
+				It("makes the app reachable via its bound route", func() {
+					Expect(cf.Cf("push", appName,
+						"-m", DEFAULT_MEMORY_LIMIT,
+						"-p", assets.NewAssets().Nginx,
+						"-s", stack,
+					).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
+
+					Eventually(func() string {
+						return helpers.CurlAppRoot(Config, appName)
+					}).Should(ContainSubstring("Hello NGINX!"))
+				})
+			})
+		}
+	})
+
+	Describe("r", func() {
+		for _, stack := range Config.GetStacks() {
+			stack := stack
+			Context(fmt.Sprintf("when using %s stack", stack), func() {
+				It("makes the app reachable via its bound route", func() {
+					Expect(cf.Cf("push", appName,
+						"-m", DEFAULT_MEMORY_LIMIT,
+						"-p", assets.NewAssets().R,
+						"-s", stack,
+					).Wait(Config.DetectTimeoutDuration())).To(Exit(0))
+
+					Eventually(func() string {
+						return helpers.CurlAppRoot(Config, appName)
+					}).Should(ContainSubstring("Hello R!"))
+				})
+			})
+		}
+	})
 })
diff --git a/helpers/assets/assets.go b/helpers/assets/assets.go
@@ -21,12 +21,14 @@ type Assets struct {
 	LoggregatorLoadGenerator   string
 	LoggregatorLoadGeneratorGo string
 	Python                     string
+	Nginx                      string
 	Node                       string
 	NodeWithProcfile           string
 	Nora                       string
 	Pora                       string
 	Php                        string
 	Proxy                      string
+	R                          string
 	RubySimple                 string
 	SecurityGroupBuildpack     string
 	ServiceBroker              string
@@ -67,13 +69,15 @@ func NewAssets() Assets {
 		JavaUnwriteableZip:         "assets/java-unwriteable-dir/java-unwriteable-dir.jar",
 		LoggregatorLoadGenerator:   "assets/loggregator-load-generator",
 		LoggregatorLoadGeneratorGo: "assets/loggregator-load-generator-go",
+		Nginx:                      "assets/nginx",
 		Node:                       "assets/node",
 		NodeWithProcfile:           "assets/node-with-procfile",
 		Nora:                       "assets/nora/NoraPublished",
 		Pora:                       "assets/pora",
 		Php:                        "assets/php",
 		Proxy:                      "assets/proxy",
 		Python:                     "assets/python",
+		R:                          "assets/r",
 		RubySimple:                 "assets/ruby_simple",
 		SecurityGroupBuildpack:     "assets/security_group_buildpack.zip",
 		ServiceBroker:              "assets/service_broker",

diff --git a/helpers/config/config.go b/helpers/config/config.go
@@ -66,10 +66,12 @@ type CatsConfig interface {
 	GetIsolationSegmentDomain() string
 	GetJavaBuildpackName() string
 	GetNamePrefix() string
+	GetNginxBuildpackName() string
 	GetNodejsBuildpackName() string
 	GetPrivateDockerRegistryImage() string
 	GetPrivateDockerRegistryUsername() string
 	GetPrivateDockerRegistryPassword() string
+	GetRBuildpackName() string
 	GetRubyBuildpackName() string
 	GetUnallocatedIPForSecurityGroup() string
 	GetRequireProxiedAppTraffic() bool

diff --git a/helpers/config/config_struct.go b/helpers/config/config_struct.go
@@ -56,9 +56,11 @@ type config struct {
 	GoBuildpackName         *string `json:"go_buildpack_name"`
 	HwcBuildpackName        *string `json:"hwc_buildpack_name"`
 	JavaBuildpackName       *string `json:"java_buildpack_name"`
+	NginxBuildpackName      *string `json:"nginx_buildpack_name"`
 	NodejsBuildpackName     *string `json:"nodejs_buildpack_name"`
 	PhpBuildpackName        *string `json:"php_buildpack_name"`
 	PythonBuildpackName     *string `json:"python_buildpack_name"`
+	RBuildpackName          *string `json:"r_buildpack_name"`
 	RubyBuildpackName       *string `json:"ruby_buildpack_name"`
 	StaticFileBuildpackName *string `json:"staticfile_buildpack_name"`
 
@@ -151,9 +153,11 @@ func getDefaults() config {
 	defaults.GoBuildpackName = ptrToString("go_buildpack")
 	defaults.HwcBuildpackName = ptrToString("hwc_buildpack")
 	defaults.JavaBuildpackName = ptrToString("java_buildpack")
+	defaults.NginxBuildpackName = ptrToString("nginx_buildpack")
 	defaults.NodejsBuildpackName = ptrToString("nodejs_buildpack")
 	defaults.PhpBuildpackName = ptrToString("php_buildpack")
 	defaults.PythonBuildpackName = ptrToString("python_buildpack")
+	defaults.RBuildpackName = ptrToString("r_buildpack")
 	defaults.RubyBuildpackName = ptrToString("ruby_buildpack")
 	defaults.StaticFileBuildpackName = ptrToString("staticfile_buildpack")
 
@@ -375,6 +379,9 @@ func validateConfig(config *config) Errors {
 	if config.JavaBuildpackName == nil {
 		errs.Add(fmt.Errorf("* 'java_buildpack_name' must not be null"))
 	}
+	if config.NginxBuildpackName == nil {
+		errs.Add(fmt.Errorf("* 'nginx_buildpack_name' must not be null"))
+	}
 	if config.NodejsBuildpackName == nil {
 		errs.Add(fmt.Errorf("* 'nodejs_buildpack_name' must not be null"))
 	}
@@ -384,6 +391,9 @@ func validateConfig(config *config) Errors {
 	if config.PythonBuildpackName == nil {
 		errs.Add(fmt.Errorf("* 'python_buildpack_name' must not be null"))
 	}
+	if config.RBuildpackName == nil {
+		errs.Add(fmt.Errorf("* 'r_buildpack_name' must not be null"))
+	}
 	if config.RubyBuildpackName == nil {
 		errs.Add(fmt.Errorf("* 'ruby_buildpack_name' must not be null"))
 	}
@@ -991,6 +1001,10 @@ func (c *config) GetIncludeVolumeServices() bool {
 	return *c.IncludeVolumeServices
 }
 
+func (c *config) GetRBuildpackName() string {
+	return *c.RBuildpackName
+}
+
 func (c *config) GetRubyBuildpackName() string {
 	return *c.RubyBuildpackName
 }
@@ -1007,6 +1021,10 @@ func (c *config) GetJavaBuildpackName() string {
 	return *c.JavaBuildpackName
 }
 
+func (c *config) GetNginxBuildpackName() string {
+	return *c.NginxBuildpackName
+}
+
 func (c *config) GetNodejsBuildpackName() string {
 	return *c.NodejsBuildpackName
 }

diff --git a/helpers/config/config_test.go b/helpers/config/config_test.go
@@ -114,9 +114,11 @@ type allConfig struct {
 	GoBuildpackName         *string `json:"go_buildpack_name"`
 	HwcBuildpackName        *string `json:"hwc_buildpack_name"`
 	JavaBuildpackName       *string `json:"java_buildpack_name"`
+	NginxBuildpackName      *string `json:"nginx_buildpack_name"`
 	NodejsBuildpackName     *string `json:"nodejs_buildpack_name"`
 	PhpBuildpackName        *string `json:"php_buildpack_name"`
 	PythonBuildpackName     *string `json:"python_buildpack_name"`
+	RBuildpackName          *string `json:"r_buildpack_name"`
 	RubyBuildpackName       *string `json:"ruby_buildpack_name"`
 	StaticFileBuildpackName *string `json:"staticfile_buildpack_name"`