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

Jump to bottom

Strip TLS prefix from TLS struct fields #250

Merged
merged 1 commit into from
Jan 19, 2021
Merged

Strip TLS prefix from TLS struct fields #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions fastly/platform_tls.go
View file
Open in desktop
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
View file
Open in desktop
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