Merge pull request #416 from shawn-hurley/add-empty-list

Add test to verify empty bundles in addition does not break

Author: openshift-merge-robot

cmd/opm/index/add.go

@@ -49,6 +49,7 @@ func addIndexAddCmd(parent *cobra.Command) {
 	indexCmd.Flags().Bool("generate", false, "if enabled, just creates the dockerfile and saves it to local disk")
 	indexCmd.Flags().StringP("out-dockerfile", "d", "", "if generating the dockerfile, this flag is used to (optionally) specify a dockerfile name")
 	indexCmd.Flags().StringP("from-index", "f", "", "previous index to add to")
+	// adding empty list of strings is a valid value.
 	indexCmd.Flags().StringSliceP("bundles", "b", nil, "comma separated list of bundles to add")
 	if err := indexCmd.MarkFlagRequired("bundles"); err != nil {
 		logrus.Panic("Failed to set required `bundles` flag for `index add`")

test/e2e/opm_test.go

@@ -357,6 +357,19 @@ var _ = Describe("opm", func() {
 			err := buildIndexWith(containerTool, indexImage, bundleImage, bundleTags)
 			Expect(err).NotTo(HaveOccurred())
 
+			workingDir, err := os.Getwd()
+			Expect(err).NotTo(HaveOccurred())
+			err = os.Remove(workingDir + "/" + bundle.DockerFile)
+			Expect(err).NotTo(HaveOccurred())
+		})
+		It("build index without bundles", func() {
+
+			indexImage := "quay.io/olmtest/e2e-index:" + rand.String(6)
+
+			By("building an index")
+			err := buildIndexWith(containerTool, indexImage, "", []string{})
+			Expect(err).NotTo(HaveOccurred())
+
 			workingDir, err := os.Getwd()
 			Expect(err).NotTo(HaveOccurred())
 			err = os.Remove(workingDir + "/" + bundle.DockerFile)