From 42a064c5b516bda30acb8cf0404451e1860905c3 Mon Sep 17 00:00:00 2001
From: straubt1 <tstraub@hashicorp.com>
Date: Fri, 13 Oct 2023 11:05:03 -0500
Subject: [PATCH] Docs and GPG consistency

---
 CHANGELOG.md                        |  8 ++++----
 cmd/admin_gpg.go                    |  2 +-
 site/docs/commands/admin_gpg.md     |  4 ++--
 site/docs/commands/workspace_run.md | 12 ++++++++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd4601a..ebd5db0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,17 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [v0.1.2] - 2023.10.13
 
 **Added**
 
+* `tfx workspace run discard` - Discard a run on a given Workspace.
+
 **Changed**
 
 * Updated go to v1.21
 * Updated all go packages to latest
-* `tfx admin gpg create` command will now output "KeyID" instead of "ID" to match the API response.
-
-**Removed**
+* `tfx admin gpg create` and `tfx admin gpg show` commands will now output "KeyID" instead of "ID" to match the API response.
 
 ## [v0.1.1] - 2022.09.11
 
diff --git a/cmd/admin_gpg.go b/cmd/admin_gpg.go
index 4937e6a..7555980 100644
--- a/cmd/admin_gpg.go
+++ b/cmd/admin_gpg.go
@@ -171,7 +171,7 @@ func gpgShow(c TfxClientContext, namespace string, keyId string) error {
 	}
 
 	o.AddMessageUserProvided("GPG Key Found", "")
-	o.AddDeferredMessageRead("ID", g.ID)
+	o.AddDeferredMessageRead("KeyID", g.KeyID)
 	o.AddDeferredMessageRead("Created", FormatDateTime(g.CreatedAt))
 	o.AddDeferredMessageRead("Updated", FormatDateTime(g.UpdatedAt))
 	o.AddDeferredMessageRead("AsciiArmor", "\n"+g.AsciiArmor)
diff --git a/site/docs/commands/admin_gpg.md b/site/docs/commands/admin_gpg.md
index 5f2f12c..e4d0bda 100644
--- a/site/docs/commands/admin_gpg.md
+++ b/site/docs/commands/admin_gpg.md
@@ -33,7 +33,7 @@ $ tfx admin gpg create --namespace firefly --public-key ./hashicorp.51852D87348F
 Using config file: /Users/tstraub/.tfx.hcl
 Create GPG Key for Organization: firefly
 GPG Key Created 
-ID:         18
+KeyID:      51852D87348FFC4C
 Created:    Fri Aug 19 21:48 2022
 Updated:    Fri Aug 19 21:48 2022
 AsciiArmor: 
@@ -80,7 +80,7 @@ $ tfx admin gpg show --namespace firefly --id 51852D87348FFC4C
 Using config file: /Users/tstraub/.tfx.hcl
 Show a GPG Key for Organization: firefly
 GPG Key Found 
-ID:         16
+KeyID:      51852D87348FFC4C
 Created:    Sat Jul  9 16:26 2022
 Updated:    Sat Jul  9 16:26 2022
 AsciiArmor: 
diff --git a/site/docs/commands/workspace_run.md b/site/docs/commands/workspace_run.md
index c4798e5..0c82143 100644
--- a/site/docs/commands/workspace_run.md
+++ b/site/docs/commands/workspace_run.md
@@ -95,3 +95,15 @@ Message:               Triggered via API
 Terraform Version:     1.0.0
 Created:               Tue Jun 28 17:46 2022
 ```
+
+## `tfx workspace run discard`
+
+Discard a supplied Run.
+
+**Example**
+
+```sh
+$ tfx workspace run discard --id run-oB7uUW4Qgk9HQMCU
+Using config file: /Users/tstraub/.tfx.hcl
+Discarded run id: run-oB7uUW4Qgk9HQMCU
+```