diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml index 326f8a19..5f2ab412 100644 --- a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml @@ -30,7 +30,7 @@ metadata: capabilities: Seamless Upgrades categories: Monitoring, Developer Tools containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev - createdAt: "2024-09-20T20:29:31Z" + createdAt: "2024-10-04T18:55:09Z" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml index cc6e4cb4..73fd622e 100644 --- a/bundle/tests/scorecard/config.yaml +++ b/bundle/tests/scorecard/config.yaml @@ -70,7 +70,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - operator-install - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313 + image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220 labels: suite: cryostat test: operator-install @@ -80,7 +80,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-cr - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313 + image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220 labels: suite: cryostat test: cryostat-cr @@ -90,7 +90,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-multi-namespace - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313 + image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220 labels: suite: cryostat test: cryostat-multi-namespace @@ -100,7 +100,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-recording - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313 + image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220 labels: suite: cryostat test: cryostat-recording @@ -110,7 +110,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-config-change - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313 + image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220 labels: suite: cryostat test: cryostat-config-change @@ -120,7 +120,7 @@ stages: - entrypoint: - cryostat-scorecard-tests - cryostat-report - image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313 + image: quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220 labels: suite: cryostat test: cryostat-report diff --git a/config/scorecard/patches/custom.config.yaml b/config/scorecard/patches/custom.config.yaml index bec7ea86..b68184f2 100644 --- a/config/scorecard/patches/custom.config.yaml +++ b/config/scorecard/patches/custom.config.yaml @@ -8,7 +8,7 @@ entrypoint: - cryostat-scorecard-tests - operator-install - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220" labels: suite: cryostat test: operator-install @@ -18,7 +18,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-cr - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220" labels: suite: cryostat test: cryostat-cr @@ -28,7 +28,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-multi-namespace - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220" labels: suite: cryostat test: cryostat-multi-namespace @@ -38,7 +38,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-recording - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220" labels: suite: cryostat test: cryostat-recording @@ -48,7 +48,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-config-change - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220" labels: suite: cryostat test: cryostat-config-change @@ -58,7 +58,7 @@ entrypoint: - cryostat-scorecard-tests - cryostat-report - image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20240911172313" + image: "quay.io/cryostat/cryostat-operator-scorecard:4.0.0-20241004185220" labels: suite: cryostat test: cryostat-report diff --git a/internal/test/scorecard/clients.go b/internal/test/scorecard/clients.go index 74b4382c..7fa5f83d 100644 --- a/internal/test/scorecard/clients.go +++ b/internal/test/scorecard/clients.go @@ -281,13 +281,13 @@ func (client *TargetClient) Create(ctx context.Context, options *Target) (*Targe return nil, fmt.Errorf("API request failed with status code: %d, response body: %s, and headers:\n%s", resp.StatusCode, ReadError(resp), ReadHeader(resp)) } - targetResp := &CustomTargetResponse{} + targetResp := &Target{} err = ReadJSON(resp, targetResp) if err != nil { return nil, fmt.Errorf("failed to read response body: %s", err.Error()) } - return targetResp.Data.Result, nil + return targetResp, nil } // Client for Cryostat Recording resources diff --git a/internal/test/scorecard/types.go b/internal/test/scorecard/types.go index 8c26603d..cdea8fa2 100644 --- a/internal/test/scorecard/types.go +++ b/internal/test/scorecard/types.go @@ -111,12 +111,6 @@ type Archive struct { Size uint32 `json:"size"` } -type CustomTargetResponse struct { - Data struct { - Result *Target `json:"result"` - } `json:"data"` -} - type Target struct { Id uint32 `json:"id,omitempty"` ConnectUrl string `json:"connectUrl"`