Skip to content

Commit

Permalink
Strip TLS prefix from TLS struct fields (#250)
Browse files Browse the repository at this point in the history
  • Loading branch information
Integralist authored Jan 19, 2021
1 parent eb65085 commit e14c695
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions fastly/platform_tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import (

// BulkCertificate represents a bulk certificate.
type BulkCertificate struct {
ID string `jsonapi:"primary,tls_bulk_certificate"`
TLSConfigurations []*TLSConfiguration `jsonapi:"relation,tls_configurations,tls_configuration"`
TLSDomains []*TLSDomain `jsonapi:"relation,tls_domains,tls_domain"`
NotAfter *time.Time `jsonapi:"attr,not_after,iso8601"`
NotBefore *time.Time `jsonapi:"attr,not_before,iso8601"`
CreatedAt *time.Time `jsonapi:"attr,created_at,iso8601"`
UpdatedAt *time.Time `jsonapi:"attr,updated_at,iso8601"`
Replace bool `jsonapi:"attr,replace"`
ID string `jsonapi:"primary,tls_bulk_certificate"`
Configurations []*TLSConfiguration `jsonapi:"relation,tls_configurations,tls_configuration"`
Domains []*TLSDomain `jsonapi:"relation,tls_domains,tls_domain"`
NotAfter *time.Time `jsonapi:"attr,not_after,iso8601"`
NotBefore *time.Time `jsonapi:"attr,not_before,iso8601"`
CreatedAt *time.Time `jsonapi:"attr,created_at,iso8601"`
UpdatedAt *time.Time `jsonapi:"attr,updated_at,iso8601"`
Replace bool `jsonapi:"attr,replace"`
}

// TLSConfiguration represents the dedicated IP address pool that will be used to route traffic from the TLSDomain.
Expand Down Expand Up @@ -121,7 +121,7 @@ func (c *Client) GetBulkCertificate(i *GetBulkCertificateInput) (*BulkCertificat
type CreateBulkCertificateInput struct {
CertBlob string `jsonapi:"attr,cert_blob"`
IntermediatesBlob string `jsonapi:"attr,intermediates_blob"`
TLSConfigurations []*TLSConfiguration `jsonapi:"relation,tls_configurations,tls_configuration"`
Configurations []*TLSConfiguration `jsonapi:"relation,tls_configurations,tls_configuration"`
}

// CreateBulkCertificate create a TLS private key.
Expand Down
4 changes: 2 additions & 2 deletions fastly/platform_tls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func TestClient_BulkCertificate(t *testing.T) {
bc, err = c.CreateBulkCertificate(&CreateBulkCertificateInput{
CertBlob: "-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----\n",
IntermediatesBlob: "-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----\n",
TLSConfigurations: []*TLSConfiguration{
Configurations: []*TLSConfiguration{
{
ID: "TLS_CONFIGURATION_ID",
},
Expand Down Expand Up @@ -95,7 +95,7 @@ func TestClient_CreateBulkCertificate_validation(t *testing.T) {
_, err = c.CreateBulkCertificate(&CreateBulkCertificateInput{
CertBlob: "-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----\n",
IntermediatesBlob: "-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----\n",
TLSConfigurations: []*TLSConfiguration{
Configurations: []*TLSConfiguration{
{
ID: "TLS_CONFIGURATION_ID",
},
Expand Down

0 comments on commit e14c695

Please sign in to comment.