Merge pull request #2202 from rnc/AMAZON

Remove Amazon AWS S3 code

Author: rnc

.github/renovate.json

@@ -17,14 +17,6 @@
       "matchCurrentValue": "/-SNAPSHOT$/",
       "enabled": false
     },
-    {
-        "description": "Set noisy package updates to only get PRs once a month",
-        "matchPackageNames": [
-            "github.com/aws/aws-sdk-go",
-            "com.amazonaws:aws-java-sdk-codeartifact"
-        ],
-      "schedule": ["before 4am on the first day of the month"]
-    }
   ],
   "enabledManagers": [
   ]

README.adoc

@@ -27,9 +27,6 @@ This is currently using link:https://docs.openshift.com/pipelines/1.15/about/op-
 The following environment variables are configurable and may be set by the user prior to deploying this depending upon which features are to be enabled.
 
 |=======================
-| AWS_ACCESS_KEY_ID | AWS Access Key used for S3 and CodeArtfact Access
-| AWS_PROFILE | AWS Region used for CodeArtifact deployment
-| AWS_SECRET_ACCESS_KEY | AWS Secret Access Key used for S3 and CodeArtfact Access
 | GIT_DEPLOY_IDENTITY | Username/organisation name for the Git service
 | GIT_DEPLOY_TOKEN | Authentication token
 | GIT_DEPLOY_URL | The URL for the Git service (GitHub/GitLab are supported) to archive the sources
@@ -41,7 +38,6 @@ The following environment variables are configurable and may be set by the user
 | JBS_GIT_CREDENTIALS | Support for private repositories (See below)
 | JBS_MAX_MEMORY | Maximum additional memory allowed
 | JBS_RECIPE_DATABASE | Recipe database to use (defaults to `https://github.com/redhat-appstudio/jvm-build-data`)
-| JBS_S3_SYNC_ENABLED | Whether to enable Amazon S3 sync for storage (default: `false`)
 | JBS_WORKER_NAMESPACE | Worker namespace (default: `test-jvm-namespace`) may be customised by setting this
 | MAVEN_PASSWORD | Password for the Maven repository
 | MAVEN_REPOSITORY | The URL for the external Maven repository to deploy to

cmd/controller/main.go

@@ -62,12 +62,6 @@ func main() {
 
 	util.ImageTag = os.Getenv("IMAGE_TAG")
 	util.ImageRepo = os.Getenv("IMAGE_REPO")
-	if os.Getenv("S3_SYNC_ENABLED") == "true" {
-		logger.Info("Enabling S3 Sync")
-		util.S3Enabled = true
-	} else {
-		logger.Info("S3 Sync Disabled")
-	}
 
 	mgr, err := controller.NewManager(restConfig, mopts)
 	if err != nil {

deploy/base-development.sh

@@ -30,17 +30,9 @@ if [ -z "$JBS_BUILD_IMAGE_SECRET" ]; then
     # Represents an empty dockerconfig.json
     export JBS_BUILD_IMAGE_SECRET="ewogICAgImF1dGhzIjogewogICAgfQp9Cg==" # notsecret
 fi
-if [ -z "$JBS_S3_SYNC_ENABLED" ]; then
-    export JBS_S3_SYNC_ENABLED=false
-fi
 if [ -z "$JBS_MAX_MEMORY" ]; then
     export JBS_MAX_MEMORY=4096
 fi
-# Horrendous hack to work around
-# https://github.com/kubernetes-sigs/kustomize/issues/5124
-# given an env var is a string (https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/)
-# and if 'true' or 'false' is seen that is coerced to a bool which causes an issue
-export JBS_S3_SYNC_ENABLED="\"$JBS_S3_SYNC_ENABLED\""
 
 function cleanAllArtifacts() {
     # Following are created in CI code
@@ -71,9 +63,6 @@ DIR=`dirname $0`
 
 echo -e "\033[0;32mRunning kustomize/kubectl...\033[0m"
 kustomize build $DIR/overlays/dev-template | envsubst '
-${AWS_ACCESS_KEY_ID}
-${AWS_PROFILE}
-${AWS_SECRET_ACCESS_KEY}
 ${GIT_DEPLOY_IDENTITY}
 ${GIT_DEPLOY_TOKEN}
 ${GIT_DEPLOY_URL}
@@ -85,7 +74,6 @@ ${JBS_QUAY_IMAGE_TAG}
 ${JBS_QUAY_ORG}
 ${JBS_MAX_MEMORY}
 ${JBS_RECIPE_DATABASE}
-${JBS_S3_SYNC_ENABLED}
 ${JBS_WORKER_NAMESPACE}
 ${MAVEN_PASSWORD}
 ${MAVEN_REPOSITORY}

deploy/base/secrets/jbs-build-maven-repo-aws.yaml

@@ -9,6 +9,4 @@ resources:
   - jbs-build-git-repo.yaml
   - jbs-build-git.yaml
   - jbs-build-image.yaml
-  - jbs-build-maven-repo-aws.yaml
   - jbs-build-maven-repo.yaml
-  - jbs-build-s3.yaml

deploy/base/secrets/jbs-build-s3.yaml

@@ -22,7 +22,7 @@ spec:
     schema:
       openAPIV3Schema:
         description: RebuiltArtifact An artifact that has been rebuilt and deployed
-          to S3 or a Container registry
+          to a Container registry
         properties:
           apiVersion:
             description: |-

deploy/base/secrets/kustomization.yaml

@@ -13,17 +13,6 @@ images:
   newTag: ${JBS_QUAY_IMAGE_TAG}
 
 patches:
-# Note - see base-development for quoting requirements for
-# JBS_S3_SYNC_ENABLED and the linked kubernete issue.
-- patch: |-
-    - op: add
-      path: /spec/template/spec/containers/0/env
-      value:
-        - name: S3_SYNC_ENABLED
-          value: ${JBS_S3_SYNC_ENABLED}
-  target:
-    kind: Deployment
-    name: hacbs-jvm-operator
 - patch: |-
     - op: replace
       path: /spec/template/spec/containers/0/imagePullPolicy

deploy/crds/base/jvmbuildservice.io_rebuiltartifacts.yaml

@@ -3,8 +3,6 @@ apiVersion: jvmbuildservice.io/v1alpha1
 kind: JBSConfig
 metadata:
   name: jvm-build-config
-  annotations:
-    jvmbuildservice.io/s3-bucket-name: "jvm-build-service-data"
 spec:
   registry:
     owner: ${QUAY_USERNAME}

deploy/operator/overlays/dev-template/kustomization.yaml

@@ -32,7 +32,6 @@ Note that these properties are only for end user builds. The config used to rebu
 The following remote stores are supported:
 
 * maven2
-* s3 (not actually implemented yet)
 
 Each remote store must be given a name, and the names are referenced by the build policies as mentioned above. To configure
 a remote artifact store you can use the following two properties:

deploy/overlays/dev-template/config.yaml

@@ -5,7 +5,6 @@ go 1.22.0
 toolchain go1.22.6
 
 require (
-	github.com/aws/aws-sdk-go v1.54.19
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-containerregistry v0.20.1 // indirect
 	github.com/google/uuid v1.6.0
@@ -15,7 +14,6 @@ require (
 	github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
 	github.com/prometheus/client_golang v1.20.5
 	github.com/prometheus/client_model v0.6.1
-	github.com/tektoncd/cli v0.37.0
 	github.com/tektoncd/pipeline v0.59.2
 	go.uber.org/zap v1.27.0
 	k8s.io/api v0.29.2
@@ -36,23 +34,18 @@ require github.com/swist/go-k8s-portforward v0.2.1
 require (
 	contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
-	github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blendle/zapdriver v1.3.1 // indirect
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/creack/pty v1.1.21 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/docker v26.1.5+incompatible // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
-	github.com/fatih/color v1.16.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/gdamore/encoding v1.0.0 // indirect
-	github.com/gdamore/tcell/v2 v2.6.0 // indirect
-	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
@@ -62,57 +55,34 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/btree v1.1.2 // indirect
 	github.com/google/cel-go v0.20.1 // indirect
 	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
-	github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/jonboulle/clockwork v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/ktr0731/go-ansisgr v0.1.0 // indirect
-	github.com/ktr0731/go-fuzzyfinder v0.8.0 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
 	github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
-	github.com/nsf/termbox-go v1.1.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/common v0.55.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/prometheus/statsd_exporter v0.22.7 // indirect
-	github.com/rivo/uniseg v0.4.4 // indirect
-	github.com/spf13/cobra v1.8.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
-	github.com/tektoncd/triggers v0.27.0 // indirect
-	github.com/xlab/treeprint v1.2.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/mod v0.20.0 // indirect
@@ -137,7 +107,5 @@ require (
 	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
 	k8s.io/kube-openapi v0.0.0-20240103051144-eec4567ac022 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )