Skip to content

Commit

Permalink
fix(blobstorage): fix all relevant fields to be pointers
Browse files Browse the repository at this point in the history
  • Loading branch information
@Integralist
Integralist committed Nov 29, 2023
1 parent b417bfa commit d05a227
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 103 deletions.
38 changes: 19 additions & 19 deletions fastly/blobstorage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ import (

// BlobStorage represents a blob storage response from the Fastly API.
type BlobStorage struct {
AccountName string `mapstructure:"account_name"`
CompressionCodec string `mapstructure:"compression_codec"`
Container string `mapstructure:"container"`
AccountName *string `mapstructure:"account_name"`
CompressionCodec *string `mapstructure:"compression_codec"`
Container *string `mapstructure:"container"`
CreatedAt *time.Time `mapstructure:"created_at"`
DeletedAt *time.Time `mapstructure:"deleted_at"`
FileMaxBytes int `mapstructure:"file_max_bytes"`
Format string `mapstructure:"format"`
FormatVersion int `mapstructure:"format_version"`
GzipLevel int `mapstructure:"gzip_level"`
MessageType string `mapstructure:"message_type"`
Name string `mapstructure:"name"`
Path string `mapstructure:"path"`
Period int `mapstructure:"period"`
Placement string `mapstructure:"placement"`
PublicKey string `mapstructure:"public_key"`
ResponseCondition string `mapstructure:"response_condition"`
SASToken string `mapstructure:"sas_token"`
ServiceID string `mapstructure:"service_id"`
ServiceVersion int `mapstructure:"version"`
TimestampFormat string `mapstructure:"timestamp_format"`
FileMaxBytes *int `mapstructure:"file_max_bytes"`
Format *string `mapstructure:"format"`
FormatVersion *int `mapstructure:"format_version"`
GzipLevel *int `mapstructure:"gzip_level"`
MessageType *string `mapstructure:"message_type"`
Name *string `mapstructure:"name"`
Path *string `mapstructure:"path"`
Period *int `mapstructure:"period"`
Placement *string `mapstructure:"placement"`
PublicKey *string `mapstructure:"public_key"`
ResponseCondition *string `mapstructure:"response_condition"`
SASToken *string `mapstructure:"sas_token"`
ServiceID *string `mapstructure:"service_id"`
ServiceVersion *int `mapstructure:"version"`
TimestampFormat *string `mapstructure:"timestamp_format"`
UpdatedAt *time.Time `mapstructure:"updated_at"`
}

Expand All @@ -47,7 +47,7 @@ func (s blobStorageByName) Swap(i, j int) {

// Less implement the sortable interface.
func (s blobStorageByName) Less(i, j int) bool {
return s[i].Name < s[j].Name
return *s[i].Name < *s[j].Name
}

// ListBlobStoragesInput is used as input to the ListBlobStorages function.
Expand Down
168 changes: 84 additions & 84 deletions fastly/blobstorage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,68 +146,68 @@ func TestClient_BlobStorages(t *testing.T) {
})
}()

if bsCreateResp1.Name != "test-blobstorage" {
t.Errorf("bad name: %q", bsCreateResp1.Name)
if *bsCreateResp1.Name != "test-blobstorage" {
t.Errorf("bad name: %q", *bsCreateResp1.Name)
}
if bsCreateResp1.Path != "/logs" {
t.Errorf("bad path: %q", bsCreateResp1.Path)
if *bsCreateResp1.Path != "/logs" {
t.Errorf("bad path: %q", *bsCreateResp1.Path)
}
if bsCreateResp1.AccountName != "test" {
t.Errorf("bad account_name: %q", bsCreateResp1.AccountName)
if *bsCreateResp1.AccountName != "test" {
t.Errorf("bad account_name: %q", *bsCreateResp1.AccountName)
}
if bsCreateResp1.Container != "fastly" {
t.Errorf("bad container: %q", bsCreateResp1.Container)
if *bsCreateResp1.Container != "fastly" {
t.Errorf("bad container: %q", *bsCreateResp1.Container)
}
if bsCreateResp1.SASToken != "sv=2015-04-05&ss=b&srt=sco&sp=rw&se=2030-07-21T18%3A00%3A00Z&sig=3ABdLOJZosCp0o491T%2BqZGKIhafF1nlM3MzESDDD3Gg%3D" {
t.Errorf("bad sas_token: %q", bsCreateResp1.SASToken)
if *bsCreateResp1.SASToken != "sv=2015-04-05&ss=b&srt=sco&sp=rw&se=2030-07-21T18%3A00%3A00Z&sig=3ABdLOJZosCp0o491T%2BqZGKIhafF1nlM3MzESDDD3Gg%3D" {
t.Errorf("bad sas_token: %q", *bsCreateResp1.SASToken)
}
if bsCreateResp1.Period != 12 {
t.Errorf("bad period: %q", bsCreateResp1.Period)
if *bsCreateResp1.Period != 12 {
t.Errorf("bad period: %q", *bsCreateResp1.Period)
}
if bsCreateResp1.TimestampFormat != "%Y-%m-%dT%H:%M:%S.000" {
t.Errorf("bad timestamp_format: %q", bsCreateResp1.TimestampFormat)
if *bsCreateResp1.TimestampFormat != "%Y-%m-%dT%H:%M:%S.000" {
t.Errorf("bad timestamp_format: %q", *bsCreateResp1.TimestampFormat)
}
if bsCreateResp1.CompressionCodec != "snappy" {
t.Errorf("bad compression_codec: %q", bsCreateResp1.CompressionCodec)
if *bsCreateResp1.CompressionCodec != "snappy" {
t.Errorf("bad compression_codec: %q", *bsCreateResp1.CompressionCodec)
}
if bsCreateResp1.GzipLevel != 0 {
t.Errorf("bad gzip_level: %q", bsCreateResp1.GzipLevel)
if *bsCreateResp1.GzipLevel != 0 {
t.Errorf("bad gzip_level: %q", *bsCreateResp1.GzipLevel)
}
if bsCreateResp1.PublicKey != "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END PGP PUBLIC KEY BLOCK-----\n" {
t.Errorf("bad public_key: %q", bsCreateResp1.PublicKey)
if *bsCreateResp1.PublicKey != "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQENBFyUD8sBCACyFnB39AuuTygseek+eA4fo0cgwva6/FSjnWq7riouQee8GgQ/\nibXTRyv4iVlwI12GswvMTIy7zNvs1R54i0qvsLr+IZ4GVGJqs6ZJnvQcqe3xPoR4\n8AnBfw90o32r/LuHf6QCJXi+AEu35koNlNAvLJ2B+KACaNB7N0EeWmqpV/1V2k9p\nlDYk+th7LcCuaFNGqKS/PrMnnMqR6VDLCjHhNx4KR79b0Twm/2qp6an3hyNRu8Gn\ndwxpf1/BUu3JWf+LqkN4Y3mbOmSUL3MaJNvyQguUzTfS0P0uGuBDHrJCVkMZCzDB\n89ag55jCPHyGeHBTd02gHMWzsg3WMBWvCsrzABEBAAG0JXRlcnJhZm9ybSAodGVz\ndCkgPHRlc3RAdGVycmFmb3JtLmNvbT6JAU4EEwEIADgWIQSHYyc6Kj9l6HzQsau6\nvFFc9jxV/wUCXJQPywIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC6vFFc\n9jxV/815CAClb32OxV7wG01yF97TzlyTl8TnvjMtoG29Mw4nSyg+mjM3b8N7iXm9\nOLX59fbDAWtBSldSZE22RXd3CvlFOG/EnKBXSjBtEqfyxYSnyOPkMPBYWGL/ApkX\nSvPYJ4LKdvipYToKFh3y9kk2gk1DcDBDyaaHvR+3rv1u3aoy7/s2EltAfDS3ZQIq\n7/cWTLJml/lleeB/Y6rPj8xqeCYhE5ahw9gsV/Mdqatl24V9Tks30iijx0Hhw+Gx\nkATUikMGr2GDVqoIRga5kXI7CzYff4rkc0Twn47fMHHHe/KY9M2yVnMHUXmAZwbG\nM1cMI/NH1DjevCKdGBLcRJlhuLPKF/anuQENBFyUD8sBCADIpd7r7GuPd6n/Ikxe\nu6h7umV6IIPoAm88xCYpTbSZiaK30Svh6Ywra9jfE2KlU9o6Y/art8ip0VJ3m07L\n4RSfSpnzqgSwdjSq5hNour2Fo/BzYhK7yaz2AzVSbe33R0+RYhb4b/6N+bKbjwGF\nftCsqVFMH+PyvYkLbvxyQrHlA9woAZaNThI1ztO5rGSnGUR8xt84eup28WIFKg0K\nUEGUcTzz+8QGAwAra+0ewPXo/AkO+8BvZjDidP417u6gpBHOJ9qYIcO9FxHeqFyu\nYrjlrxowEgXn5wO8xuNz6Vu1vhHGDHGDsRbZF8pv1d5O+0F1G7ttZ2GRRgVBZPwi\nkiyRABEBAAGJATYEGAEIACAWIQSHYyc6Kj9l6HzQsau6vFFc9jxV/wUCXJQPywIb\nDAAKCRC6vFFc9jxV/9YOCACe8qmOSnKQpQfW+PqYOqo3dt7JyweTs3FkD6NT8Zml\ndYy/vkstbTjPpX6aTvUZjkb46BVi7AOneVHpD5GBqvRsZ9iVgDYHaehmLCdKiG5L\n3Tp90NN+QY5WDbsGmsyk6+6ZMYejb4qYfweQeduOj27aavCJdLkCYMoRKfcFYI8c\nFaNmEfKKy/r1PO20NXEG6t9t05K/frHy6ZG8bCNYdpagfFVot47r9JaQqWlTNtIR\n5+zkkSq/eG9BEtRij3a6cTdQbktdBzx2KBeI0PYc1vlZR0LpuFKZqY9vlE6vTGLR\nwMfrTEOvx0NxUM3rpaCgEmuWbB1G1Hu371oyr4srrr+N\n=28dr\n-----END PGP PUBLIC KEY BLOCK-----\n" {
t.Errorf("bad public_key: %q", *bsCreateResp1.PublicKey)
}
if bsCreateResp1.Format != "%h %l %u %{now}V %{req.method}V %{req.url}V %>s %{resp.http.Content-Length}V" {
t.Errorf("bad format: %q", bsCreateResp1.Format)
if *bsCreateResp1.Format != "%h %l %u %{now}V %{req.method}V %{req.url}V %>s %{resp.http.Content-Length}V" {
t.Errorf("bad format: %q", *bsCreateResp1.Format)
}
if bsCreateResp1.FormatVersion != 2 {
t.Errorf("bad format_version: %q", bsCreateResp1.FormatVersion)
if *bsCreateResp1.FormatVersion != 2 {
t.Errorf("bad format_version: %q", *bsCreateResp1.FormatVersion)
}
if bsCreateResp1.MessageType != "classic" {
t.Errorf("bad message_type: %q", bsCreateResp1.MessageType)
if *bsCreateResp1.MessageType != "classic" {
t.Errorf("bad message_type: %q", *bsCreateResp1.MessageType)
}
if bsCreateResp1.Placement != "waf_debug" {
t.Errorf("bad placement: %q", bsCreateResp1.Placement)
if *bsCreateResp1.Placement != "waf_debug" {
t.Errorf("bad placement: %q", *bsCreateResp1.Placement)
}
if bsCreateResp1.FileMaxBytes != MiB {
t.Errorf("bad file_max_bytes: %q", bsCreateResp1.FileMaxBytes)
if *bsCreateResp1.FileMaxBytes != MiB {
t.Errorf("bad file_max_bytes: %q", *bsCreateResp1.FileMaxBytes)
}
if bsCreateResp2.CompressionCodec != "" {
t.Errorf("bad compression_codec: %q", bsCreateResp2.CompressionCodec)
if bsCreateResp2.CompressionCodec != nil {
t.Errorf("bad compression_codec: %q", *bsCreateResp2.CompressionCodec)
}
if bsCreateResp2.GzipLevel != 8 {
t.Errorf("bad gzip_level: %q", bsCreateResp2.GzipLevel)
if *bsCreateResp2.GzipLevel != 8 {
t.Errorf("bad gzip_level: %q", *bsCreateResp2.GzipLevel)
}
if bsCreateResp2.FileMaxBytes != 10*MiB {
t.Errorf("bad file_max_bytes: %q", bsCreateResp2.FileMaxBytes)
if *bsCreateResp2.FileMaxBytes != 10*MiB {
t.Errorf("bad file_max_bytes: %q", *bsCreateResp2.FileMaxBytes)
}
if bsCreateResp3.CompressionCodec != "snappy" {
t.Errorf("bad compression_codec: %q", bsCreateResp3.CompressionCodec)
if *bsCreateResp3.CompressionCodec != "snappy" {
t.Errorf("bad compression_codec: %q", *bsCreateResp3.CompressionCodec)
}
if bsCreateResp3.GzipLevel != 0 {
t.Errorf("bad gzip_level: %q", bsCreateResp3.GzipLevel)
if *bsCreateResp3.GzipLevel != 0 {
t.Errorf("bad gzip_level: %q", *bsCreateResp3.GzipLevel)
}
if bsCreateResp3.FileMaxBytes != 0 {
t.Errorf("bad file_max_bytes: %q", bsCreateResp3.FileMaxBytes)
if *bsCreateResp3.FileMaxBytes != 0 {
t.Errorf("bad file_max_bytes: %q", *bsCreateResp3.FileMaxBytes)
}

// List
Expand Down Expand Up @@ -237,47 +237,47 @@ func TestClient_BlobStorages(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if bsCreateResp1.Name != bsGetResp.Name {
t.Errorf("bad name: %q", bsCreateResp1.Name)
if *bsCreateResp1.Name != *bsGetResp.Name {
t.Errorf("bad name: %q", *bsCreateResp1.Name)
}
if bsCreateResp1.Path != bsGetResp.Path {
t.Errorf("bad path: %q", bsCreateResp1.Path)
if *bsCreateResp1.Path != *bsGetResp.Path {
t.Errorf("bad path: %q", *bsCreateResp1.Path)
}
if bsCreateResp1.AccountName != bsGetResp.AccountName {
t.Errorf("bad account_name: %q", bsCreateResp1.AccountName)
if *bsCreateResp1.AccountName != *bsGetResp.AccountName {
t.Errorf("bad account_name: %q", *bsCreateResp1.AccountName)
}
if bsCreateResp1.Container != bsGetResp.Container {
t.Errorf("bad container: %q", bsCreateResp1.Container)
if *bsCreateResp1.Container != *bsGetResp.Container {
t.Errorf("bad container: %q", *bsCreateResp1.Container)
}
if bsCreateResp1.SASToken != bsGetResp.SASToken {
t.Errorf("bad sas_token: %q", bsCreateResp1.SASToken)
if *bsCreateResp1.SASToken != *bsGetResp.SASToken {
t.Errorf("bad sas_token: %q", *bsCreateResp1.SASToken)
}
if bsCreateResp1.Period != bsGetResp.Period {
t.Errorf("bad period: %q", bsCreateResp1.Period)
if *bsCreateResp1.Period != *bsGetResp.Period {
t.Errorf("bad period: %q", *bsCreateResp1.Period)
}
if bsCreateResp1.TimestampFormat != bsGetResp.TimestampFormat {
t.Errorf("bad timestamp_format: %q", bsCreateResp1.TimestampFormat)
if *bsCreateResp1.TimestampFormat != *bsGetResp.TimestampFormat {
t.Errorf("bad timestamp_format: %q", *bsCreateResp1.TimestampFormat)
}
if bsCreateResp1.CompressionCodec != bsGetResp.CompressionCodec {
t.Errorf("bad compression_codec: %q", bsCreateResp1.CompressionCodec)
if *bsCreateResp1.CompressionCodec != *bsGetResp.CompressionCodec {
t.Errorf("bad compression_codec: %q", *bsCreateResp1.CompressionCodec)
}
if bsCreateResp1.GzipLevel != bsGetResp.GzipLevel {
t.Errorf("bad gzip_level: %q", bsCreateResp1.GzipLevel)
if *bsCreateResp1.GzipLevel != *bsGetResp.GzipLevel {
t.Errorf("bad gzip_level: %q", *bsCreateResp1.GzipLevel)
}
if bsCreateResp1.PublicKey != bsGetResp.PublicKey {
t.Errorf("bad public_key: %q", bsCreateResp1.PublicKey)
if *bsCreateResp1.PublicKey != *bsGetResp.PublicKey {
t.Errorf("bad public_key: %q", *bsCreateResp1.PublicKey)
}
if bsCreateResp1.Format != bsGetResp.Format {
t.Errorf("bad format: %q", bsCreateResp1.Format)
if *bsCreateResp1.Format != *bsGetResp.Format {
t.Errorf("bad format: %q", *bsCreateResp1.Format)
}
if bsCreateResp1.FormatVersion != bsGetResp.FormatVersion {
t.Errorf("bad format_version: %q", bsCreateResp1.FormatVersion)
if *bsCreateResp1.FormatVersion != *bsGetResp.FormatVersion {
t.Errorf("bad format_version: %q", *bsCreateResp1.FormatVersion)
}
if bsCreateResp1.MessageType != bsGetResp.MessageType {
t.Errorf("bad message_type: %q", bsCreateResp1.MessageType)
if *bsCreateResp1.MessageType != *bsGetResp.MessageType {
t.Errorf("bad message_type: %q", *bsCreateResp1.MessageType)
}
if bsCreateResp1.Placement != bsGetResp.Placement {
t.Errorf("bad placement: %q", bsCreateResp1.Placement)
if *bsCreateResp1.Placement != *bsGetResp.Placement {
t.Errorf("bad placement: %q", *bsCreateResp1.Placement)
}

// Update
Expand Down Expand Up @@ -324,26 +324,26 @@ func TestClient_BlobStorages(t *testing.T) {
t.Fatal(err)
}

if bsUpdateResp1.Name != "new-test-blobstorage" {
t.Errorf("bad name: %q", bsUpdateResp1.Name)
if *bsUpdateResp1.Name != "new-test-blobstorage" {
t.Errorf("bad name: %q", *bsUpdateResp1.Name)
}
if bsUpdateResp1.CompressionCodec != "zstd" {
t.Errorf("bad compression_codec: %q", bsUpdateResp1.CompressionCodec)
if *bsUpdateResp1.CompressionCodec != "zstd" {
t.Errorf("bad compression_codec: %q", *bsUpdateResp1.CompressionCodec)
}
if bsUpdateResp1.FileMaxBytes != 5*MiB {
t.Errorf("bad file_max_bytes: %q", bsUpdateResp1.FileMaxBytes)
if *bsUpdateResp1.FileMaxBytes != 5*MiB {
t.Errorf("bad file_max_bytes: %q", *bsUpdateResp1.FileMaxBytes)
}
if bsUpdateResp2.CompressionCodec != "zstd" {
t.Errorf("bad compression_codec: %q", bsUpdateResp2.CompressionCodec)
if *bsUpdateResp2.CompressionCodec != "zstd" {
t.Errorf("bad compression_codec: %q", *bsUpdateResp2.CompressionCodec)
}
if bsUpdateResp2.GzipLevel != 0 {
t.Errorf("bad gzip_level: %q", bsUpdateResp2.GzipLevel)
if *bsUpdateResp2.GzipLevel != 0 {
t.Errorf("bad gzip_level: %q", *bsUpdateResp2.GzipLevel)
}
if bsUpdateResp3.CompressionCodec != "" {
t.Errorf("bad compression_codec: %q", bsUpdateResp3.CompressionCodec)
if bsUpdateResp3.CompressionCodec != nil {
t.Errorf("bad compression_codec: %q", *bsUpdateResp3.CompressionCodec)
}
if bsUpdateResp3.GzipLevel != 9 {
t.Errorf("bad gzip_level: %q", bsUpdateResp3.GzipLevel)
if *bsUpdateResp3.GzipLevel != 9 {
t.Errorf("bad gzip_level: %q", *bsUpdateResp3.GzipLevel)
}

// Delete
Expand Down

0 comments on commit d05a227

Please sign in to comment.