alexvanin/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

Rename CAPool to CaPool.

Browse source
This commit is contained in:
Mariano Cano 2021-06-07 19:20:23 -07:00
parent 9db68db509
commit 529eb4bae9
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cas/apiv1/options.go
View file

@ -49,7 +49,7 @@ type Options struct {
// certificate authority.
Project string `json:"-"`
Location string `json:"-"`
CAPool string `json:"-"`
CaPool string `json:"-"`
}
// CertificateIssuer contains the properties used to use the StepCAS certificate

9
cas/cloudcas/cloudcas.go
View file

@ -100,9 +100,10 @@ func New(ctx context.Context, opts apiv1.Options) (*CloudCAS, error) {
return nil, errors.New("cloudCAS 'project' cannot be empty")
case opts.Location == "":
return nil, errors.New("cloudCAS 'location' cannot be empty")
case opts.CAPool == "":
case opts.CaPool == "":
return nil, errors.New("cloudCAS 'caPool' cannot be empty")
}
} else {
if opts.CertificateAuthority == "" {
return nil, errors.New("cloudCAS 'certificateAuthority' cannot be empty")
@ -118,8 +119,8 @@ func New(ctx context.Context, opts apiv1.Options) (*CloudCAS, error) {
if opts.Location == "" {
opts.Location = parts[3]
}
if opts.CAPool == "" {
opts.CAPool = parts[5]
if opts.CaPool == "" {
opts.CaPool = parts[5]
}
}
}
@ -134,7 +135,7 @@ func New(ctx context.Context, opts apiv1.Options) (*CloudCAS, error) {
certificateAuthority: opts.CertificateAuthority,
project: opts.Project,
location: opts.Location,
caPool: opts.CAPool,
caPool: opts.CaPool,
}, nil
}

4
cas/cloudcas/cloudcas_test.go
View file

@ -290,7 +290,7 @@ func TestNew(t *testing.T) {
caPool: testCaPool,
}, false},
{"ok creator", args{context.Background(), apiv1.Options{
IsCreator: true, Project: testProject, Location: testLocation, CAPool: testCaPool,
IsCreator: true, Project: testProject, Location: testLocation, CaPool: testCaPool,
}}, &CloudCAS{
client: &testClient{},
project: testProject,
@ -311,7 +311,7 @@ func TestNew(t *testing.T) {
IsCreator: true, Project: testProject, Location: "",
}}, nil, true},
{"fail caPool", args{context.Background(), apiv1.Options{
IsCreator: true, Project: testProject, Location: testLocation, CAPool: "",
IsCreator: true, Project: testProject, Location: testLocation, CaPool: "",
}}, nil, true},
}
for _, tt := range tests {