Bump github.com/Dynatrace/libbuildpack-dynatrace to v1.5.2 (#701)

* Bump github.com/Dynatrace/libbuildpack-dynatrace to v1.5.2

* Integration tests updated

* comment removed

---------

Co-authored-by: Sophie Wigmore <[email protected]>

Author: rbamberger

fixtures/fake_dynatrace_api/main.go

@@ -79,6 +79,12 @@ func main() {
 			json.NewEncoder(w).Encode(payload)
 
 		case "/v1/deployment/installer/agent/processmoduleconfig":
+			if os.Getenv("API_CONNECTION_FAIL") == "true" {
+				w.WriteHeader(http.StatusInternalServerError)
+				w.Write([]byte(err.Error()))
+				return
+			}
+
 			fakeConfig, err := os.ReadFile("fake_config.json")
 			if err != nil {
 				w.WriteHeader(http.StatusInternalServerError)

go.mod

@@ -1,7 +1,7 @@
 module github.com/cloudfoundry/python-buildpack
 
 require (
-	github.com/Dynatrace/libbuildpack-dynatrace v1.5.0
+	github.com/Dynatrace/libbuildpack-dynatrace v1.5.2
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/cloudfoundry/libbuildpack v0.0.0-20230209225346-0e58f7be61d4
 	github.com/golang/mock v1.6.0

go.sum

@@ -4,6 +4,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/Dynatrace/libbuildpack-dynatrace v1.5.0 h1:EZ2fSooBGd179dFbM673l1RE7zGfKuyVUujl/plWsnU=
 github.com/Dynatrace/libbuildpack-dynatrace v1.5.0/go.mod h1:TojYXsxk1r+TaVOTUOWKyX2hAOzbvb+BsQGxUZ8Cb2s=
+github.com/Dynatrace/libbuildpack-dynatrace v1.5.2 h1:yiF8yuJ4762ocmZEM+/K8auciKFQ3XfQb/0Qt7VL+rU=
+github.com/Dynatrace/libbuildpack-dynatrace v1.5.2/go.mod h1:Uu9aa5UFAk1Ua+zZXnvzo+avDXuEi+GtegeOyja9xg4=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=

src/python/integration/deploy_python_app_with_dynatrace_test.go

@@ -15,17 +15,20 @@ import (
 
 var _ = Describe("CF Python Buildpack", func() {
 	var (
-		app             *cutlass.App
-		createdServices []string
-		dynatraceAPI    *cutlass.App
-		dynatraceAPIURI string
+		app                   *cutlass.App
+		createdServices       []string
+		dynatraceAPI          *cutlass.App
+		dynatraceAPIURI       string
+		dynatraceBrokenAPI    *cutlass.App
+		dynatraceBrokenAPIURI string
 	)
 
 	BeforeEach(func() {
 		if isSerialTest {
 			Skip("Skipping parallel tests")
 		}
 
+		//API mocking App
 		dynatraceAPI = cutlass.New(Fixtures("fake_dynatrace_api"))
 		// TODO: remove this once go-buildpack runs on cflinuxfs4
 		// This is done to have the dynatrace broker app written in go up and running
@@ -41,6 +44,23 @@ var _ = Describe("CF Python Buildpack", func() {
 		dynatraceAPIURI, err = dynatraceAPI.GetUrl("")
 		Expect(err).NotTo(HaveOccurred())
 
+		//API mocking App with broken processmoduleconfig Endpoint
+		dynatraceBrokenAPI = cutlass.New(Fixtures("fake_dynatrace_api"))
+
+		// TODO: remove this once go-buildpack runs on cflinuxfs4
+		// This is done to have the dynatrace broker app written in go up and running
+		if os.Getenv("CF_STACK") == "cflinuxfs4" {
+			dynatraceBrokenAPI.Stack = "cflinuxfs3"
+		}
+		dynatraceBrokenAPI.SetEnv("BP_DEBUG", "true")
+		dynatraceBrokenAPI.SetEnv("API_CONNECTION_FAIL", "true")
+
+		Expect(dynatraceBrokenAPI.Push()).To(Succeed())
+		Eventually(func() ([]string, error) { return dynatraceBrokenAPI.InstanceStates() }, 60*time.Second).Should(Equal([]string{"RUNNING"}))
+
+		dynatraceBrokenAPIURI, err = dynatraceBrokenAPI.GetUrl("")
+		Expect(err).NotTo(HaveOccurred())
+
 		app = cutlass.New(filepath.Join(bpDir, "fixtures", "flask"))
 		app.SetEnv("BP_DEBUG", "true")
 		PushAppAndConfirm(app)
@@ -59,6 +79,16 @@ var _ = Describe("CF Python Buildpack", func() {
 			_, err := command.Output()
 			Expect(err).To(BeNil())
 		}
+
+		if dynatraceAPI != nil {
+			dynatraceAPI.Destroy()
+		}
+		dynatraceAPI = nil
+
+		if dynatraceBrokenAPI != nil {
+			dynatraceBrokenAPI.Destroy()
+		}
+		dynatraceBrokenAPI = nil
 	})
 
 	Context("deploying a Python app with Dynatrace agent with single credentials service", func() {
@@ -271,4 +301,46 @@ var _ = Describe("CF Python Buildpack", func() {
 		})
 	})
 
+	Context("deploying a Python app with Dynatrace OneAgent being able to contact the API to fetch the updated OneAgent config", func() {
+		It("checks if agent config update via API was successful", func() {
+			serviceName := "dynatrace-" + cutlass.RandStringRunes(20) + "-service"
+			command := exec.Command("cf", "cups", serviceName, "-p", fmt.Sprintf("'{\"apitoken\":\"secretpaastoken\",\"apiurl\":\"%s\",\"environmentid\":\"envid\"}'", dynatraceAPIURI))
+			_, err := command.CombinedOutput()
+			Expect(err).To(BeNil())
+			createdServices = append(createdServices, serviceName)
+			command = exec.Command("cf", "bind-service", app.Name, serviceName)
+			_, err = command.CombinedOutput()
+			Expect(err).To(BeNil())
+
+			command = exec.Command("cf", "restage", app.Name)
+			_, err = command.Output()
+			Expect(err).To(BeNil())
+
+			Expect(app.ConfirmBuildpack(buildpackVersion)).To(Succeed())
+			Expect(app.Stdout.String()).To(ContainSubstring("Fetching updated OneAgent configuration from tenant..."))
+			Expect(app.Stdout.String()).To(ContainSubstring("Successfully fetched updated OneAgent config from the API"))
+		})
+	})
+
+	Context("deploying a Python app with Dynatrace OneAgent not being able to contact the API to fetch the updated OneAgent config", func() {
+		It("checks if agent config update via API fails soft", func() {
+			serviceName := "dynatrace-" + cutlass.RandStringRunes(20) + "-service"
+
+			command := exec.Command("cf", "cups", serviceName, "-p", fmt.Sprintf("'{\"apitoken\":\"secretpaastoken\",\"apiurl\":\"%s\",\"environmentid\":\"envid\"}'", dynatraceBrokenAPIURI))
+			_, err := command.CombinedOutput()
+			Expect(err).To(BeNil())
+			createdServices = append(createdServices, serviceName)
+			command = exec.Command("cf", "bind-service", app.Name, serviceName)
+			_, err = command.CombinedOutput()
+			Expect(err).To(BeNil())
+
+			command = exec.Command("cf", "restage", app.Name)
+			_, err = command.Output()
+			Expect(err).To(BeNil())
+
+			Expect(app.ConfirmBuildpack(buildpackVersion)).To(Succeed())
+			Expect(app.Stdout.String()).To(ContainSubstring("Fetching updated OneAgent configuration from tenant..."))
+			Expect(app.Stdout.String()).To(ContainSubstring("Failed to fetch updated OneAgent config from the API"))
+		})
+	})
 })

vendor/github.com/Dynatrace/libbuildpack-dynatrace/hook.go

@@ -1,8 +1,8 @@
 # code.cloudfoundry.org/lager v2.0.0+incompatible
 ## explicit
 code.cloudfoundry.org/lager
-# github.com/Dynatrace/libbuildpack-dynatrace v1.5.0
-## explicit
+# github.com/Dynatrace/libbuildpack-dynatrace v1.5.2
+## explicit; go 1.19
 github.com/Dynatrace/libbuildpack-dynatrace
 # github.com/Masterminds/semver v1.5.0
 ## explicit