From 50c97c48085ecdd16c87c4f60827bbb7be20c432 Mon Sep 17 00:00:00 2001
From: "docmerlin (j. Emrys Landivar)" <landivar@gmail.com>
Date: Tue, 17 Nov 2020 08:46:46 -0600
Subject: [PATCH] chore: update CHANGELOG.md

---
 CHANGELOG.md          |  1 +
 cmd/influx/v1_dbrp.go | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b9bc762b4d..68a353c147a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 1. [20036](https://github.com/influxdata/influxdb/pull/20036): Warn if V1 users are upgraded, but V1 auth wasn't enabled
 1. [20039](https://github.com/influxdata/influxdb/pull/20039): Export 1.x CQs as part of `influxd upgrade`
+1. [20067](https://github.com/influxdata/influxdb/pull/20067): Add DBRP cli commands as `influxd v1 dbrp`
 
 ### Bug Fixes
 
diff --git a/cmd/influx/v1_dbrp.go b/cmd/influx/v1_dbrp.go
index f1f82fbfcce..62c04e8e7a3 100644
--- a/cmd/influx/v1_dbrp.go
+++ b/cmd/influx/v1_dbrp.go
@@ -79,10 +79,6 @@ func v1DBRPFindF(cmd *cobra.Command, args []string) error {
 	}
 	filter := influxdb.DBRPMappingFilterV2{OrgID: &orgID}
 
-	if err := filter.OrgID.DecodeFromString(orgID.String()); err != nil {
-		return err
-	}
-
 	if v1DBRPFindFlags.ID != "" {
 		fID, err := influxdb.IDFromString(v1DBRPFindFlags.ID)
 		if err != nil {
@@ -99,6 +95,18 @@ func v1DBRPFindF(cmd *cobra.Command, args []string) error {
 		filter.BucketID = fID
 	}
 
+	if v1DBRPFindFlags.DB != "" {
+		fID, err := influxdb.IDFromString(v1DBRPFindFlags.BucketID)
+		if err != nil {
+			return err
+		}
+		filter.BucketID = fID
+	}
+
+	if v1DBRPFindFlags.RP != "" {
+		filter.RetentionPolicy = &v1DBRPFindFlags.RP
+	}
+
 	dbrps, _, err := s.FindMany(context.Background(), filter, influxdb.FindOptions{})
 	if err != nil {
 		return err
@@ -290,9 +298,8 @@ func v1DBRPDeleteF(cmd *cobra.Command, args []string) error {
 var v1DBRPUpdateFlags struct {
 	ID      string       // Specifies the mapping ID to filter on
 	Org     organization // required  // Specifies the organization ID to filter on
-	DB      string       //InfluxDB v1 database
-	Default *bool
-	RP      string // InfluxDB v1 retention policy
+	Default *bool        // pointer nil means that Default is unset in the Flags
+	RP      string       // InfluxDB v1 retention policy
 }
 
 func v1DBRPUpdateCmd(f *globalFlags, opt genericCLIOpts) *cobra.Command {
@@ -317,7 +324,6 @@ func v1DBRPUpdateF(cmd *cobra.Command, args []string) error {
 	}
 	if defaultFlg := cmd.Flags().Lookup("default"); defaultFlg.Changed {
 		defaultBool, _ := cmd.Flags().GetBool("default")
-		defaultBool = false
 		v1DBRPUpdateFlags.Default = &defaultBool
 	}