Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support acme ssl certificates #636

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: support acme ssl certificates #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a456bd0
feat: support acme ssl certificates
heuels Jan 3, 2025
2b24075
Moving ACME to a separate resource
vaerh Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions routeros/mikrotik_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const (
crudUpdate
crudDelete
crudPost
crudEnableSslCertificate
crudImport
crudSign
crudSignViaScep
Expand Down
29 changes: 15 additions & 14 deletions routeros/mikrotik_client_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,21 @@ type ApiClient struct {

var (
apiMethodName = map[crudMethod]string{
crudCreate: "/add",
crudRead: "/print",
crudUpdate: "/set",
crudDelete: "/remove",
crudPost: "/set",
crudImport: "/import",
crudSign: "/sign",
crudSignViaScep: "/add-scep",
crudRemove: "/remove",
crudRevoke: "/issued-revoke",
crudMove: "/move",
crudStart: "/start",
crudStop: "/stop",
crudGenerateKey: "/generate-key",
crudCreate: "/add",
crudRead: "/print",
crudUpdate: "/set",
crudDelete: "/remove",
crudPost: "/set",
crudEnableSslCertificate: "/enable-ssl-certificate",
crudImport: "/import",
crudSign: "/sign",
crudSignViaScep: "/add-scep",
crudRemove: "/remove",
crudRevoke: "/issued-revoke",
crudMove: "/move",
crudStart: "/start",
crudStop: "/stop",
crudGenerateKey: "/generate-key",
}
)

Expand Down
29 changes: 15 additions & 14 deletions routeros/mikrotik_client_rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,21 @@ type errorResponse struct {

var (
restMethodName = map[crudMethod]string{
crudCreate: "PUT",
crudRead: "GET",
crudUpdate: "PATCH",
crudDelete: "DELETE",
crudPost: "POST",
crudImport: "POST",
crudSign: "POST",
crudSignViaScep: "POST",
crudRemove: "POST",
crudRevoke: "POST",
crudMove: "POST",
crudStart: "POST",
crudStop: "POST",
crudGenerateKey: "POST",
crudCreate: "PUT",
crudRead: "GET",
crudUpdate: "PATCH",
crudDelete: "DELETE",
crudPost: "POST",
crudEnableSslCertificate: "POST",
crudImport: "POST",
crudSign: "POST",
crudSignViaScep: "POST",
crudRemove: "POST",
crudRevoke: "POST",
crudMove: "POST",
crudStart: "POST",
crudStop: "POST",
crudGenerateKey: "POST",
}
)

Expand Down
1 change: 1 addition & 0 deletions routeros/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ func Provider() *schema.Provider {
"routeros_ip_cloud": ResourceIpCloud(),
"routeros_ip_cloud_advanced": ResourceIpCloudAdvanced(),
"routeros_system_certificate": ResourceSystemCertificate(),
"routeros_system_certificate_acme": ResourceSystemCertificateAcme(),
"routeros_system_certificate_scep_server": ResourceCertificateScepServer(),
"routeros_certificate_scep_server": ResourceCertificateScepServer(),
"routeros_system_clock": ResourceSystemClock(),
Expand Down
64 changes: 55 additions & 9 deletions routeros/resource_system_certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,36 @@ func ResourceSystemCertificate() *schema.Resource {
resSchema := map[string]*schema.Schema{
MetaResourcePath: PropResourcePath("/certificate"),
MetaId: PropId(Id),
MetaSkipFields: PropSkipFields("import", "sign", "sign_via_scep"),
MetaSkipFields: PropSkipFields("acme_ssl_certificate", "import", "sign", "sign_via_scep"),

"acme_ssl_certificate": {
Type: schema.TypeSet,
Optional: true,
Description: "Enable SSL certificate. This will generate a new certificate using ACME protocol.",
ConflictsWith: []string{"import", "sign", "sign_via_scep"},
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"directory_url": {
Type: schema.TypeString,
Optional: true,
Description: "ACME directory url.",
DiffSuppressFunc: AlwaysPresentNotUserProvided,
},
"eab_hmac_key": {
Type: schema.TypeString,
Optional: true,
Description: "HMAC key for ACME External Account Binding (optional).",
DiffSuppressFunc: AlwaysPresentNotUserProvided,
},
"eab_kid": {
Type: schema.TypeString,
Optional: true,
Description: "Key identifier.",
DiffSuppressFunc: AlwaysPresentNotUserProvided,
},
},
},
},
"authority": {
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -126,7 +154,7 @@ func ResourceSystemCertificate() *schema.Resource {
Type: schema.TypeSet,
Optional: true,
ForceNew: true,
ConflictsWith: []string{"sign", "sign_via_scep"},
ConflictsWith: []string{"acme_ssl_certificate", "sign", "sign_via_scep"},
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"cert_file_name": {
Expand Down Expand Up @@ -249,7 +277,7 @@ func ResourceSystemCertificate() *schema.Resource {
Type: schema.TypeSet,
Optional: true,
ForceNew: true,
ConflictsWith: []string{"sign_via_scep"},
ConflictsWith: []string{"acme_ssl_certificate", "sign_via_scep"},
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"ca": {
Expand Down Expand Up @@ -282,7 +310,7 @@ func ResourceSystemCertificate() *schema.Resource {
Type: schema.TypeSet,
Optional: true,
ForceNew: true,
ConflictsWith: []string{"sign"},
ConflictsWith: []string{"acme_ssl_certificate", "sign"},
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"scep_url": {
Expand Down Expand Up @@ -426,11 +454,13 @@ func ResourceSystemCertificate() *schema.Resource {
var command string // MikroTik command to sign certificate
var ok bool

if _, ok = d.GetOk("import"); !ok {
// Run DefaultCreate.
diags = ResourceCreate(ctx, resSchema, d, m)
if diags.HasError() {
return diags
if _, ok = d.GetOk("acme_ssl_certificate"); !ok {
if _, ok = d.GetOk("import"); !ok {
// Run DefaultCreate.
diags = ResourceCreate(ctx, resSchema, d, m)
if diags.HasError() {
return diags
}
}
}

Expand All @@ -447,6 +477,11 @@ func ResourceSystemCertificate() *schema.Resource {
crudMethod = crudSignViaScep
// https://router/rest/certificate/add-scep
command = "/add-scep"
} else if cmdBlock, ok = d.GetOk("acme_ssl_certificate"); ok {
params = MikrotikItem{"dns-name": d.Get("common_name").(string)}
crudMethod = crudEnableSslCertificate
// https://router/rest/certificate/enable-ssl-certificate
command = "/enable-ssl-certificate"
} else if cmdBlock, ok = d.GetOk("import"); ok {
return certImport(ctx, cmdBlock, d, m)
} else {
Expand Down Expand Up @@ -481,6 +516,17 @@ func ResourceSystemCertificate() *schema.Resource {
return diag.FromErr(err)
}

if command == "/enable-ssl-certificate" {
d.SetId(d.Get("name").(string))
id, err := dynamicIdLookup(Name, resSchema[MetaResourcePath].Default.(string), m.(Client), d)

if err != nil {
return diag.FromErr(err)
}

d.SetId(id)
}

return ResourceRead(ctx, resSchema, d, m)
}

Expand Down
Loading
Loading