plume/release: drop support for old `--bucket` switch
The new commands only support `--bucket-prefix`.
@@ -33,7 +33,6 @@ import (
var (
awsCredentialsFile string
- specBucket string
specProfile string
specRegion string
specStream string
@@ -85,8 +84,8 @@ func validateArgs(args []string) {
if specStream == "" {
plog.Fatal("--stream is required")
}
- if specBucket == "" && specBucketPrefix == "" {
- plog.Fatal("--bucket or --bucket-prefix is required")
+ if specBucketPrefix == "" {
+ plog.Fatal("--bucket-prefix is required")
}
if specRegion == "" {
plog.Fatal("--region is required")
@@ -121,7 +120,6 @@ func getAWSApi() *aws.API {
}
func getBucketAndStreamPrefix() (string, string) {
- if specBucketPrefix != "" {
split := strings.SplitN(specBucketPrefix, "/", 2)
if len(split) != 2 {
plog.Fatalf("can't split %q into bucket and prefix", specBucketPrefix)
@@ -129,12 +127,6 @@ func getBucketAndStreamPrefix() (string, string) {
return split[0], split[1]
}
- // Assumes the bucket layout defined inside of
- // https://github.com/coreos/fedora-coreos-tracker/issues/189.
- // We'll drop support for this soon.
- return specBucket, filepath.Join("prod", "streams", specStream)
-}
-
func getReleaseMetadata(api *aws.API) release.Release {
bucket, prefix := getBucketAndStreamPrefix()
releasePath := filepath.Join(prefix, "builds", specVersion, "release.json")
