Skip to content

Commit 700fb49

Browse files
committed
Re commited Vertica
1 parent 604ef1e commit 700fb49

File tree

3 files changed

+46
-28
lines changed

3 files changed

+46
-28
lines changed
Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package vertica
22

33
import (
4-
"context"
5-
64
"github.com/1Password/shell-plugins/sdk"
75
"github.com/1Password/shell-plugins/sdk/importer"
86
"github.com/1Password/shell-plugins/sdk/provision"
@@ -13,9 +11,8 @@ import (
1311

1412
func DatabaseCredentials() schema.CredentialType {
1513
return schema.CredentialType{
16-
Name: credname.DatabaseCredentials,
17-
DocsURL: sdk.URL("https://www.vertica.com/docs/9.2.x/HTML/Content/Authoring/ConnectingToVertica/vsql/Install/InstallingTheVsqlClient.htm"),
18-
ManagementURL: sdk.URL("https://www.vertica.com/try/"),
14+
Name: credname.DatabaseCredentials,
15+
DocsURL: sdk.URL("https://www.vertica.com/docs/9.2.x/HTML/Content/Authoring/AdministratorsGuide/DBUsersAndPrivileges/Users/CreatingADatabaseUser.htm"),
1916
Fields: []schema.CredentialField{
2017
{
2118
Name: fieldname.Host,
@@ -30,7 +27,6 @@ func DatabaseCredentials() schema.CredentialType {
3027
{
3128
Name: fieldname.Username,
3229
MarkdownDescription: "Vertica user to authenticate as.",
33-
Optional: true,
3430
},
3531
{
3632
Name: fieldname.Password,
@@ -40,18 +36,16 @@ func DatabaseCredentials() schema.CredentialType {
4036
{
4137
Name: fieldname.Database,
4238
MarkdownDescription: "Database name to connect to.",
43-
Optional: true,
4439
},
4540
},
4641
DefaultProvisioner: provision.EnvVars(defaultEnvVarMapping),
47-
Importer: importer.TryAllimporter.TryEnvVarPair(defaultEnvVarMapping)}
42+
Importer: importer.TryEnvVarPair(defaultEnvVarMapping)}
4843
}
4944

5045
var defaultEnvVarMapping = map[string]sdk.FieldName{
51-
"VSQL_USER": fieldname.Username,
52-
"VSQL_PASSWORD": fieldname.Password,
53-
"VSQL_HOST": fieldname.Host,
54-
"VSQL_PORT": fieldname.Port,
55-
"VSQL_DATABASE": fieldname.Database,
46+
"VSQL_USER": fieldname.Username,
47+
"VSQL_PASSWORD": fieldname.Password,
48+
"VSQL_HOST": fieldname.Host,
49+
"VSQL_PORT": fieldname.Port,
50+
"VSQL_DATABASE": fieldname.Database,
5651
}
57-

plugins/vertica/database_credentials_test.go

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,56 @@ package vertica
22

33
import (
44
"testing"
5-
5+
66
"github.com/1Password/shell-plugins/sdk"
77
"github.com/1Password/shell-plugins/sdk/plugintest"
88
"github.com/1Password/shell-plugins/sdk/schema/fieldname"
99
)
10-
10+
1111
func TestDatabaseCredentialsProvisioner(t *testing.T) {
1212
plugintest.TestProvisioner(t, DatabaseCredentials().DefaultProvisioner, map[string]plugintest.ProvisionCase{
1313
"default": {
1414
ItemFields: map[sdk.FieldName]string{
15-
fieldname.User: "vertica",
16-
fieldname.Password: "",
17-
fieldname.Host: "localhost",
18-
fieldname.Port: "5433",
15+
fieldname.Username: "vertica",
16+
fieldname.Password: "Il0v3y04",
17+
fieldname.Host: "localhost",
18+
fieldname.Port: "5433",
1919
fieldname.Database: "VMart",
2020
},
2121
ExpectedOutput: sdk.ProvisionOutput{
2222
Environment: map[string]string{
23-
"VSQL_USER": "vertica",
24-
"VSQL_PASSWORD": "",
25-
"VSQL_HOST": "localhost",
26-
"VSQL_PORT": "5433",
23+
"VSQL_USER": "vertica",
24+
"VSQL_PASSWORD": "Il0v3y04",
25+
"VSQL_HOST": "localhost",
26+
"VSQL_PORT": "5433",
2727
"VSQL_DATABASE": "VMart",
2828
},
2929
},
3030
},
3131
})
3232
}
33+
34+
func TestAPIKeyImporter(t *testing.T) {
35+
plugintest.TestImporter(t, DatabaseCredentials().Importer, map[string]plugintest.ImportCase{
36+
"environment": {
37+
Environment: map[string]string{
38+
"VSQL_USER": "vertica",
39+
"VSQL_PASSWORD": "Il0v3y04",
40+
"VSQL_HOST": "localhost",
41+
"VSQL_PORT": "5433",
42+
"VSQL_DATABASE": "VMart",
43+
},
44+
ExpectedCandidates: []sdk.ImportCandidate{
45+
{
46+
Fields: map[sdk.FieldName]string{
47+
fieldname.Username: "vertica",
48+
fieldname.Password: "Il0v3y04",
49+
fieldname.Host: "localhost",
50+
fieldname.Port: "5433",
51+
fieldname.Database: "VMart",
52+
},
53+
},
54+
},
55+
},
56+
})
57+
}

plugins/vertica/vsql.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ import (
99

1010
func VerticaCLI() schema.Executable {
1111
return schema.Executable{
12-
Name: "Vertica CLI",
13-
Runs: []string{"vsql"},
14-
DocsURL: sdk.URL("https://www.vertica.com/docs/9.2.x/HTML/Content/Authoring/ConnectingToVertica/vsql/UsingVsql.htm"),
12+
Name: "Vertica CLI",
13+
Runs: []string{"vsql"},
14+
DocsURL: sdk.URL("https://www.vertica.com/docs/9.2.x/HTML/Content/Authoring/ConnectingToVertica/vsql/UsingVsql.htm"),
1515
NeedsAuth: needsauth.IfAll(
1616
needsauth.NotForHelpOrVersion(),
17-
needsauth.NotWithoutArgs(),
1817
),
1918
Uses: []schema.CredentialUsage{
2019
{

0 commit comments

Comments
 (0)