Support releases-api returned content-type (#57)

* Support releases-api returned content-type Signed-off-by: Scott Macfarlane <smacfarlane@hashicorp.com> * Set Go to v1.18 when building consul from source Signed-off-by: Scott Macfarlane <smacfarlane@hashicorp.com> * remove unused variables Co-authored-by: Radek Simko <radek.simko@gmail.com>
hashicorp · May 10, 2022 · ba20d15 · ba20d15
1 parent 099cd34
commit ba20d15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/internal/releasesjson/releases.go b/internal/releasesjson/releases.go
@@ -79,7 +79,7 @@ func (r *Releases) ListProductVersions(ctx context.Context, productName string)
 	}
 
 	contentType := resp.Header.Get("content-type")
-	if contentType != "application/json" {
+	if contentType != "application/json" && contentType != "application/vnd+hashicorp.releases-api.v0+json" {
 		return nil, fmt.Errorf("unexpected Content-Type: %q", contentType)
 	}
 
@@ -144,7 +144,7 @@ func (r *Releases) GetProductVersion(ctx context.Context, product string, versio
 	}
 
 	contentType := resp.Header.Get("content-type")
-	if contentType != "application/json" {
+	if contentType != "application/json" && contentType != "application/vnd+hashicorp.releases-api.v0+json" {
 		return nil, fmt.Errorf("unexpected Content-Type: %q", contentType)
 	}
 

diff --git a/product/consul.go b/product/consul.go
@@ -15,9 +15,7 @@ import (
 var consulVersionOutputRe = regexp.MustCompile(`Consul ` + simpleVersionRe)
 
 var (
-	v1_16 = version.Must(version.NewVersion("1.16"))
-	// TODO: version.MustConstraint() ?
-	v1_16c, _ = version.NewConstraint("1.16")
+	v1_18 = version.Must(version.NewVersion("1.18"))
 )
 
 var Consul = Product{
@@ -52,6 +50,6 @@ var Consul = Product{
 	BuildInstructions: &BuildInstructions{
 		GitRepoURL:    "https://github.com/hashicorp/consul.git",
 		PreCloneCheck: &build.GoIsInstalled{},
-		Build:         &build.GoBuild{Version: v1_16},
+		Build:         &build.GoBuild{Version: v1_18},
 	},
 }