← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/provider/ec2/credentials.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/provider/ec2/credentials.go
23
23
func (environProviderCredentials) CredentialSchemas() map[cloud.AuthType]cloud.CredentialSchema {
24
24
        return map[cloud.AuthType]cloud.CredentialSchema{
25
25
                cloud.AccessKeyAuthType: {
26
 
                        "access-key": {
27
 
                                Description: "The EC2 access key",
28
 
                        },
29
 
                        "secret-key": {
30
 
                                Description: "The EC2 secret key",
31
 
                                Hidden:      true,
 
26
                        {
 
27
                                "access-key",
 
28
                                cloud.CredentialAttr{
 
29
                                        Description: "The EC2 access key",
 
30
                                },
 
31
                        }, {
 
32
                                "secret-key",
 
33
                                cloud.CredentialAttr{
 
34
                                        Description: "The EC2 secret key",
 
35
                                        Hidden:      true,
 
36
                                },
32
37
                        },
33
38
                },
34
39
        }