From 5df4e66205d24ad9e7a45742f2225cb2ac6a645f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Greinhofer?= <remy.greinhofer@gmail.com>
Date: Thu, 6 Jan 2022 09:50:11 -0600
Subject: [PATCH] Prepare release 1.6.0 (#90)

Prepares the codebase for 1.6.0 release.
---
 CHANGELOG.md   | 8 ++++++++
 README.md      | 6 ++++--
 magefile.go    | 1 +
 tfecli/core.go | 4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 604b612..d5a777e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.6.0] - 2021-01-06
+
+### Added
+
+* Added support for TFE_ADDRESS and TFE_BASEPATH environment variables. [#89]
+
 ## [1.5.0] - 2021-01-12
 
 ### Added
@@ -88,6 +94,7 @@ Initial version with support for managing:
 [1.4.1]: https://github.com/rgreinho/tfe-cli/releases/tag/1.4.1
 [1.4.2]: https://github.com/rgreinho/tfe-cli/releases/tag/1.4.2
 [1.5.0]: https://github.com/rgreinho/tfe-cli/releases/tag/1.5.0
+[1.6.0]: https://github.com/rgreinho/tfe-cli/releases/tag/1.6.0
 
 [//]: # (Issue/PR links)
 [#14]: https://github.com/rgreinho/tfe-cli/pull/14
@@ -104,3 +111,4 @@ Initial version with support for managing:
 [#37]: https://github.com/rgreinho/tfe-cli/pull/37
 [#38]: https://github.com/rgreinho/tfe-cli/pull/38
 [#40]: https://github.com/rgreinho/tfe-cli/pull/40
+[#89]: https://github.com/rgreinho/tfe-cli/pull/89
diff --git a/README.md b/README.md
index 812d2f4..2bc2601 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,11 @@ For Windows, download the binary from the [release page](https://github.com/rgre
 * `TFE_ORG`: Terraform Enterprise organization
 * `TFE_LOG_LEVEL`: Logging level (valid values are `debug`, `info`, `warn`, `error`,
   `fatal`, `panic`)
+* `TFE_ADDRESS`: Terraform Enterprise API address
+* `TFE_BASEPATH`: Base path on which the Terraform Enterprise API is served.
 
-These values can also be specified on the command line. In this case, the environment
-variables are ignored.
+Some of these values can also be specified on the command line. In this case, the
+environment variables are ignored.
 
 ## Management commands
 
diff --git a/magefile.go b/magefile.go
index a44ff52..5d98f56 100644
--- a/magefile.go
+++ b/magefile.go
@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main
diff --git a/tfecli/core.go b/tfecli/core.go
index 112e7b8..a1f3410 100644
--- a/tfecli/core.go
+++ b/tfecli/core.go
@@ -45,8 +45,8 @@ func newClient(token string) (*tfe.Client, error) {
 
 	// Prepare TFE config.
 	config := &tfe.Config{
-		Token: token,
-		Address: Address,
+		Token:    token,
+		Address:  Address,
 		BasePath: BasePath,
 	}