Merge pull request #64 from lorengordon/rclone-update

plus3it · Nov 2, 2021 · a998c4b · a998c4b
2 parents 5431a65 + 3175ac1
commit a998c4b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 5.0.2
+current_version = 5.0.3
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ SHELL := /bin/bash
 include $(shell test -f .tardigrade-ci || curl -sSL -o .tardigrade-ci "https://raw.githubusercontent.com/plus3it/tardigrade-ci/master/bootstrap/Makefile.bootstrap"; echo .tardigrade-ci)
 
 ## Install rclone
-rclone/install: RCLONE_VERSION ?= tags/v1.53.4
+rclone/install: RCLONE_VERSION ?= latest
 rclone/install: $(BIN_DIR) guard/program/unzip
 	@ echo "[$@]: Installing $(@D)..."
 	$(call download_github_release,$(@D).zip,$(@D),$(@D),$(RCLONE_VERSION),.name | endswith("$(OS)-$(ARCH).zip"))

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ terraform apply -var bucket_name=<BUCKET> -var salt_versions='["SALT_VERSION"]'
 1.  An AWS credential with get/put permissions to the S3 bucket must be pre-
     configured. Any method supported by the `aws` CLI may be used to configure
     the credential.
-2.  `rclone` must be installed and available and in the PATH.
+2.  `rclone` >= 1.57.0 must be installed and available and in the PATH.
 
 ## Testing
 

diff --git a/modules/repo/main.tf b/modules/repo/main.tf
@@ -14,8 +14,6 @@ locals {
     "RCLONE_CONFIG_SALT_PROVIDER=Other",
     "RCLONE_CONFIG_SALT_ENV_AUTH=false",
     "RCLONE_CONFIG_SALT_ENDPOINT=%s", # %s is repo.salt_s3_endpoint
-    "RCLONE_CONFIG_S3_TYPE=s3",
-    "RCLONE_CONFIG_S3_ENV_AUTH=true",
     "rclone sync",
     "--delete-excluded --use-server-modtime --update --fast-list -v",
     "--filter '- **/{i386,i686,SRPMS}/**'",
@@ -26,16 +24,16 @@ locals {
   rclone_python2 = concat(
     local.rclone_base,
     [
-      "salt:s3/yum",             # rclone source
-      "s3:${var.bucket_name}/%s" # rclone target, %s is repo.repo_prefix_python2
+      "salt:s3/yum",                            # rclone source
+      ":s3,env_auth=true:${var.bucket_name}/%s" # rclone target, %s is repo.repo_prefix_python2
     ]
   )
 
   rclone_python3 = concat(
     local.rclone_base,
     [
-      "salt:s3/py3",             # rclone source
-      "s3:${var.bucket_name}/%s" # rclone target, %s is repo.repo_prefix_python3
+      "salt:s3/py3",                            # rclone source
+      ":s3,env_auth=true:${var.bucket_name}/%s" # rclone target, %s is repo.repo_prefix_python3
     ]
   )
 }