hcq/influx-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add virtual column to DBRP printing (#435)

Browse Source 
* feat: add virtual column to DBRP printing

* fix: update DBRP tests with new virtual column

* chore: update to latest openapi
This commit is contained in:
Andrew Lee
2022-08-03 16:14:07 -06:00
committed by GitHub
parent fbbe9743f2
commit 7bdad28ee0
13 changed files with 144 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clients/v1_dbrps/v1_dbrps.go
View File

@ -207,6 +207,7 @@ func (c Client) printDBRPs(opts dbrpPrintOpts) error {
"Bucket ID",
"Retention Policy",
"Default",
"Virtual",
"Organization ID",
}
@ -221,6 +222,7 @@ func (c Client) printDBRPs(opts dbrpPrintOpts) error {
"Database": t.Database,
"Retention Policy": t.RetentionPolicy,
"Default": t.Default,
"Virtual": t.GetVirtual(),
"Organization ID": t.OrgID,
"Bucket ID": t.BucketID,
}

22
clients/v1_dbrps/v1_dbrps_test.go
View File

@ -80,8 +80,8 @@ func TestClient_List(t *testing.T) {
}, nil)
},
outLines: []string{
`123\s+someDB\s+456\s+someRP\s+false\s+1234123412341234`,
`234\s+someDB\s+456\s+someRP\s+true\s+1234123412341234`,
`123\s+someDB\s+456\s+someRP\s+false\s+false\s+1234123412341234`,
`234\s+someDB\s+456\s+someRP\s+true\s+false\s+1234123412341234`,
},
},
{
@ -120,7 +120,7 @@ func TestClient_List(t *testing.T) {
require.Equal(t, tc.expectedError, err)
if tc.expectedError == nil {
testutils.MatchLines(t, append([]string{`ID\s+Database\s+Bucket\s+ID\s+Retention Policy\s+Default\s+Organization ID`}, tc.outLines...), strings.Split(stdout.String(), "\n"))
testutils.MatchLines(t, append([]string{`ID\s+Database\s+Bucket\s+ID\s+Retention Policy\s+Default\s+Virtual\s+Organization ID`}, tc.outLines...), strings.Split(stdout.String(), "\n"))
}
})
}
@ -160,7 +160,7 @@ func TestClient_Create(t *testing.T) {
}, nil)
},
outLines: []string{
`123\s+someDB\s+456\s+someRP\s+false\s+1234123412341234`,
`123\s+someDB\s+456\s+someRP\s+false\s+false\s+1234123412341234`,
},
},
{
@ -200,7 +200,7 @@ func TestClient_Create(t *testing.T) {
require.Equal(t, tc.expectedError, err)
if tc.expectedError == nil {
testutils.MatchLines(t, append([]string{`ID\s+Database\s+Bucket\s+ID\s+Retention Policy\s+Default\s+Organization ID`}, tc.outLines...), strings.Split(stdout.String(), "\n"))
testutils.MatchLines(t, append([]string{`ID\s+Database\s+Bucket\s+ID\s+Retention Policy\s+Default\s+Virtual\s+Organization ID`}, tc.outLines...), strings.Split(stdout.String(), "\n"))
}
})
}
@ -243,7 +243,7 @@ func TestClient_Update(t *testing.T) {
}, nil)
},
outLines: []string{
`123\s+someDB\s+456\s+someRP\s+false\s+1234123412341234`,
`123\s+someDB\s+456\s+someRP\s+false\s+false\s+1234123412341234`,
},
},
{
@ -268,7 +268,7 @@ func TestClient_Update(t *testing.T) {
}, nil)
},
outLines: []string{
`123\s+someDB\s+456\s+someRP\s+false\s+1234123412341234`,
`123\s+someDB\s+456\s+someRP\s+false\s+false\s+1234123412341234`,
},
},
{
@ -308,7 +308,7 @@ func TestClient_Update(t *testing.T) {
require.Equal(t, tc.expectedError, err)
if tc.expectedError == nil {
testutils.MatchLines(t, append([]string{`ID\s+Database\s+Bucket\s+ID\s+Retention Policy\s+Default\s+Organization ID`}, tc.outLines...), strings.Split(stdout.String(), "\n"))
testutils.MatchLines(t, append([]string{`ID\s+Database\s+Bucket\s+ID\s+Retention Policy\s+Default\s+Virtual\s+Organization ID`}, tc.outLines...), strings.Split(stdout.String(), "\n"))
}
})
}
@ -355,7 +355,7 @@ func TestClient_Delete(t *testing.T) {
DBRPsApi.EXPECT().DeleteDBRPIDExecute(gomock.Any()).Return(nil)
},
outLines: []string{
`123\s+someDB\s+456\s+someRP\s+false\s+1234123412341234`,
`123\s+someDB\s+456\s+someRP\s+false\s+false\s+1234123412341234`,
},
},
{
@ -384,7 +384,7 @@ func TestClient_Delete(t *testing.T) {
DBRPsApi.EXPECT().DeleteDBRPIDExecute(gomock.Any()).Return(nil)
},
outLines: []string{
`123\s+someDB\s+456\s+someRP\s+false\s+1234123412341234`,
`123\s+someDB\s+456\s+someRP\s+false\s+false\s+1234123412341234`,
},
},
{
@ -453,7 +453,7 @@ func TestClient_Delete(t *testing.T) {
require.Equal(t, tc.expectedError, err)
if tc.expectedError == nil {
testutils.MatchLines(t, append([]string{`ID\s+Database\s+Bucket\s+ID\s+Retention Policy\s+Default\s+Organization ID`}, tc.outLines...), strings.Split(stdout.String(), "\n"))
testutils.MatchLines(t, append([]string{`ID\s+Database\s+Bucket\s+ID\s+Retention Policy\s+Default\s+Virtual\s+Organization ID`}, tc.outLines...), strings.Split(stdout.String(), "\n"))
}
})
}