iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optionally disable password authentication for Linux builds

This commit is contained in:
Paul Meyer 2020-07-16 19:44:01 +00:00
parent 93d4d63121
commit 5fd68374fe
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builder/azure/common/template/template_builder.go
View File

@ -43,7 +43,7 @@ func NewTemplateBuilder(template string) (*TemplateBuilder, error) {
}, nil
}
func (s *TemplateBuilder) BuildLinux(sshAuthorizedKey string) error {
func (s *TemplateBuilder) BuildLinux(sshAuthorizedKey string, disablePasswordAuthentication bool) error {
resource, err := s.getResourceByType(resourceVirtualMachine)
if err != nil {
return err
@ -61,6 +61,11 @@ func (s *TemplateBuilder) BuildLinux(sshAuthorizedKey string) error {
},
}
if disablePasswordAuthentication {
profile.LinuxConfiguration.DisablePasswordAuthentication = to.BoolPtr(true)
profile.AdminPassword = nil
}
s.osType = compute.Linux
return nil
}

2
builder/azure/common/template/template_builder_test.TestBuildLinux00.approved.json
View File

@ -126,10 +126,10 @@
]
},
"osProfile": {
"adminPassword": "[parameters('adminPassword')]",
"adminUsername": "[parameters('adminUsername')]",
"computerName": "[parameters('vmName')]",
"linuxConfiguration": {
"disablePasswordAuthentication": true,
"ssh": {
"publicKeys": [
{

2
builder/azure/common/template/template_builder_test.TestBuildLinux02.approved.json
View File

@ -87,10 +87,10 @@
]
},
"osProfile": {
"adminPassword": "[parameters('adminPassword')]",
"adminUsername": "[parameters('adminUsername')]",
"computerName": "[parameters('vmName')]",
"linuxConfiguration": {
"disablePasswordAuthentication": true,
"ssh": {
"publicKeys": [
{

2
builder/azure/common/template/template_builder_test.TestSetIdentity00.approved.json
View File

@ -132,10 +132,10 @@
]
},
"osProfile": {
"adminPassword": "[parameters('adminPassword')]",
"adminUsername": "[parameters('adminUsername')]",
"computerName": "[parameters('vmName')]",
"linuxConfiguration": {
"disablePasswordAuthentication": true,
"ssh": {
"publicKeys": [
{

12
builder/azure/common/template/template_builder_test.go
View File

@ -15,7 +15,7 @@ func TestBuildLinux00(t *testing.T) {
t.Fatal(err)
}
err = testSubject.BuildLinux("--test-ssh-authorized-key--")
err = testSubject.BuildLinux("--test-ssh-authorized-key--", true)
if err != nil {
t.Fatal(err)
}
@ -43,7 +43,7 @@ func TestBuildLinux01(t *testing.T) {
t.Fatal(err)
}
err = testSubject.BuildLinux("--test-ssh-authorized-key--")
err = testSubject.BuildLinux("--test-ssh-authorized-key--", false)
if err != nil {
t.Fatal(err)
}
@ -71,7 +71,7 @@ func TestBuildLinux02(t *testing.T) {
t.Fatal(err)
}
testSubject.BuildLinux("--test-ssh-authorized-key--")
testSubject.BuildLinux("--test-ssh-authorized-key--", true)
testSubject.SetImageUrl("http://azure/custom.vhd", compute.Linux, compute.CachingTypesReadWrite)
testSubject.SetOSDiskSizeGB(100)
@ -189,7 +189,7 @@ func TestSharedImageGallery00(t *testing.T) {
t.Fatal(err)
}
err = testSubject.BuildLinux("--test-ssh-authorized-key--")
err = testSubject.BuildLinux("--test-ssh-authorized-key--", false)
if err != nil {
t.Fatal(err)
}
@ -218,7 +218,7 @@ func TestNetworkSecurityGroup00(t *testing.T) {
t.Fatal(err)
}
err = testSubject.BuildLinux("--test-ssh-authorized-key--")
err = testSubject.BuildLinux("--test-ssh-authorized-key--", false)
if err != nil {
t.Fatal(err)
}
@ -251,7 +251,7 @@ func TestSetIdentity00(t *testing.T) {
t.Fatal(err)
}
if err = testSubject.BuildLinux("--test-ssh-authorized-key--"); err != nil {
if err = testSubject.BuildLinux("--test-ssh-authorized-key--", true); err != nil {
t.Fatal(err)
}