Skip to content

BCH-1290: Extend CertificateContext with renewal_eligibility, issued_… #4

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

Merged
saltpy-cs merged 1 commit into from
Jun 2, 2026
Merged

BCH-1290: Extend CertificateContext with renewal_eligibility, issued_… #4

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
6 changes: 6 additions & 0 deletions internal/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ type CertificateContext struct {
DomainName string `json:"domain_name"`
Status string `json:"status"`
NotAfter *time.Time `json:"not_after,omitempty"`
IssuedAt *time.Time `json:"issued_at,omitempty"`
KeyAlgorithm string `json:"key_algorithm"`
Type string `json:"type,omitempty"`
RenewalEligibility string `json:"renewal_eligibility,omitempty"`
TransparencyLoggingPreference string `json:"transparency_logging_preference"`
DomainValidationOptions []DomainValidationOption `json:"domain_validation_options"`
InUseBy []string `json:"in_use_by"`
Expand Down Expand Up @@ -160,7 +163,10 @@ func (df *DataFetcher) fetchCertificate(ctx context.Context, client ACMClient, r
DomainName: aws.ToString(detail.DomainName),
Status: string(detail.Status),
NotAfter: detail.NotAfter,
IssuedAt: detail.IssuedAt,
KeyAlgorithm: strings.ReplaceAll(string(detail.KeyAlgorithm), "-", "_"),
Type: string(detail.Type),
RenewalEligibility: string(detail.RenewalEligibility),
TransparencyLoggingPreference: transparencyPref,
DomainValidationOptions: dvos,
InUseBy: inUseBy,
Expand Down
127 changes: 127 additions & 0 deletions internal/data_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,133 @@ func TestFetchData_KeyTypeFilter(t *testing.T) {
}
}

func TestFetchData_NewFields_AmazonIssuedEligible(t *testing.T) {
arn := "arn:aws:acm:us-east-1:123456789012:certificate/eligible"
issuedAt := time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC)
notAfter := time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)

mock := &mockACMClient{
listCertificates: func(_ context.Context, _ *acm.ListCertificatesInput, _ ...func(*acm.Options)) (*acm.ListCertificatesOutput, error) {
return &acm.ListCertificatesOutput{
CertificateSummaryList: []types.CertificateSummary{{CertificateArn: aws.String(arn)}},
}, nil
},
describeCertificate: func(_ context.Context, _ *acm.DescribeCertificateInput, _ ...func(*acm.Options)) (*acm.DescribeCertificateOutput, error) {
return &acm.DescribeCertificateOutput{
Certificate: &types.CertificateDetail{
CertificateArn: aws.String(arn),
DomainName: aws.String("example.com"),
Status: types.CertificateStatusIssued,
NotAfter: &notAfter,
IssuedAt: &issuedAt,
Type: types.CertificateTypeAmazonIssued,
RenewalEligibility: types.RenewalEligibilityEligible,
},
}, nil
},
listTagsForCertificate: func(_ context.Context, _ *acm.ListTagsForCertificateInput, _ ...func(*acm.Options)) (*acm.ListTagsForCertificateOutput, error) {
return &acm.ListTagsForCertificateOutput{}, nil
},
}

f := newTestFetcher([]string{"us-east-1"}, mock)
certs, err := f.FetchData(context.Background())
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
c := certs[0]
if c.Type != "AMAZON_ISSUED" {
t.Errorf("type: want %q, got %q", "AMAZON_ISSUED", c.Type)
}
if c.RenewalEligibility != "ELIGIBLE" {
t.Errorf("renewal_eligibility: want %q, got %q", "ELIGIBLE", c.RenewalEligibility)
}
if c.IssuedAt == nil || !c.IssuedAt.Equal(issuedAt) {
t.Errorf("issued_at: want %v, got %v", issuedAt, c.IssuedAt)
}
}

func TestFetchData_NewFields_AmazonIssuedIneligible(t *testing.T) {
arn := "arn:aws:acm:us-east-1:123456789012:certificate/ineligible"

mock := &mockACMClient{
listCertificates: func(_ context.Context, _ *acm.ListCertificatesInput, _ ...func(*acm.Options)) (*acm.ListCertificatesOutput, error) {
return &acm.ListCertificatesOutput{
CertificateSummaryList: []types.CertificateSummary{{CertificateArn: aws.String(arn)}},
}, nil
},
describeCertificate: func(_ context.Context, _ *acm.DescribeCertificateInput, _ ...func(*acm.Options)) (*acm.DescribeCertificateOutput, error) {
return &acm.DescribeCertificateOutput{
Certificate: &types.CertificateDetail{
CertificateArn: aws.String(arn),
DomainName: aws.String("example.com"),
Status: types.CertificateStatusIssued,
Type: types.CertificateTypeAmazonIssued,
RenewalEligibility: types.RenewalEligibilityIneligible,
},
}, nil
},
listTagsForCertificate: func(_ context.Context, _ *acm.ListTagsForCertificateInput, _ ...func(*acm.Options)) (*acm.ListTagsForCertificateOutput, error) {
return &acm.ListTagsForCertificateOutput{}, nil
},
}

f := newTestFetcher([]string{"us-east-1"}, mock)
certs, err := f.FetchData(context.Background())
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
c := certs[0]
if c.RenewalEligibility != "INELIGIBLE" {
t.Errorf("renewal_eligibility: want %q, got %q", "INELIGIBLE", c.RenewalEligibility)
}
if c.IssuedAt != nil {
t.Errorf("issued_at: want nil for cert without IssuedAt, got %v", c.IssuedAt)
}
}

func TestFetchData_NewFields_ImportedCert(t *testing.T) {
arn := "arn:aws:acm:us-east-1:123456789012:certificate/imported"

mock := &mockACMClient{
listCertificates: func(_ context.Context, _ *acm.ListCertificatesInput, _ ...func(*acm.Options)) (*acm.ListCertificatesOutput, error) {
return &acm.ListCertificatesOutput{
CertificateSummaryList: []types.CertificateSummary{{CertificateArn: aws.String(arn)}},
}, nil
},
describeCertificate: func(_ context.Context, _ *acm.DescribeCertificateInput, _ ...func(*acm.Options)) (*acm.DescribeCertificateOutput, error) {
return &acm.DescribeCertificateOutput{
Certificate: &types.CertificateDetail{
CertificateArn: aws.String(arn),
DomainName: aws.String("example.com"),
Status: types.CertificateStatusIssued,
Type: types.CertificateTypeImported,
// RenewalEligibility and IssuedAt are zero/nil for imported certs
},
}, nil
},
listTagsForCertificate: func(_ context.Context, _ *acm.ListTagsForCertificateInput, _ ...func(*acm.Options)) (*acm.ListTagsForCertificateOutput, error) {
return &acm.ListTagsForCertificateOutput{}, nil
},
}

f := newTestFetcher([]string{"us-east-1"}, mock)
certs, err := f.FetchData(context.Background())
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
c := certs[0]
if c.Type != "IMPORTED" {
t.Errorf("type: want %q, got %q", "IMPORTED", c.Type)
}
if c.RenewalEligibility != "" {
t.Errorf("renewal_eligibility: want %q for imported cert, got %q", "", c.RenewalEligibility)
}
if c.IssuedAt != nil {
t.Errorf("issued_at: want nil for imported cert, got %v", c.IssuedAt)
}
}

func TestFetchData_AccountIDFromARN(t *testing.T) {
cases := []struct {
arn string
Expand Down
Loading