Skip to content

Update get namespace capacity info, protos #490

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

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

Update get namespace capacity info, protos #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c47be0e
Update get namespace capacity info, protos
chndler Feb 6, 2026
6d0e64c
deleted+removed blank import, go mod tidy
chndler Feb 6, 2026
1c63a25
Fix copylocks lint errors in account and namespace tests
chndler Feb 6, 2026
0feafcb
Suppress deprecated API lint warnings in namespace.go
chndler Feb 6, 2026
39c1df9
update NamespaceCapacityInfo_Stats proto
chndler Feb 6, 2026
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
68 changes: 34 additions & 34 deletions app/account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ func (s *AccountTestSuite) TestCreateAuditLogSink() {
name string
args []string
expectErr bool
expectRequest cloudservice.CreateAccountAuditLogSinkRequest
expectRequest *cloudservice.CreateAccountAuditLogSinkRequest
createError error
}{
{
Expand All @@ -655,7 +655,7 @@ func (s *AccountTestSuite) TestCreateAuditLogSink() {
"--destination-uri", "arn:aws:kinesis:us-east-1:123456789012:stream/TestStream",
"--region", "us-east-1"},
expectErr: false,
expectRequest: cloudservice.CreateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.CreateAccountAuditLogSinkRequest{
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "audit_log_01",
Enabled: true,
Expand All @@ -676,7 +676,7 @@ func (s *AccountTestSuite) TestCreateAuditLogSink() {
"--destination-uri", "arn:aws:kinesis:us-east-1:123456789012:stream/TestStream",
"--region", "us-east-1"},
expectErr: true,
expectRequest: cloudservice.CreateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.CreateAccountAuditLogSinkRequest{
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "audit_log_01",
Enabled: true,
Expand Down Expand Up @@ -717,7 +717,7 @@ func (s *AccountTestSuite) TestCreateAuditLogSink() {
args: []string{"a", "al", "pubsub", "create", "--sink-name", "audit_log_01",
"--service-account-email", "123456789012@TestProject.iam.gserviceaccount.com", "--topic-name", "TestTopic"},
expectErr: false,
expectRequest: cloudservice.CreateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.CreateAccountAuditLogSinkRequest{
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "audit_log_01",
Enabled: true,
Expand Down Expand Up @@ -746,8 +746,8 @@ func (s *AccountTestSuite) TestCreateAuditLogSink() {
}
for _, tc := range tests {
s.Run(tc.name, func() {
if tc.expectRequest != (cloudservice.CreateAccountAuditLogSinkRequest{}) {
s.mockCloudApiClient.EXPECT().CreateAccountAuditLogSink(gomock.Any(), &tc.expectRequest).Return(&cloudservice.CreateAccountAuditLogSinkResponse{
if tc.expectRequest != nil {
s.mockCloudApiClient.EXPECT().CreateAccountAuditLogSink(gomock.Any(), tc.expectRequest).Return(&cloudservice.CreateAccountAuditLogSinkResponse{
AsyncOperation: &operation.AsyncOperation{
Id: "123",
},
Expand All @@ -768,7 +768,7 @@ func (s *AccountTestSuite) TestUpdateAuditLogSink() {
name string
args []string
expectErr bool
expectRequest cloudservice.UpdateAccountAuditLogSinkRequest
expectRequest *cloudservice.UpdateAccountAuditLogSinkRequest
expectGetRequest bool
updateError error
getSinkError error
Expand All @@ -781,7 +781,7 @@ func (s *AccountTestSuite) TestUpdateAuditLogSink() {
"--region", "us-east-1", "--enabled", "true"},
expectErr: false,
expectGetRequest: true,
expectRequest: cloudservice.UpdateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.UpdateAccountAuditLogSinkRequest{
ResourceVersion: "123",
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "audit_log_01",
Expand All @@ -804,7 +804,7 @@ func (s *AccountTestSuite) TestUpdateAuditLogSink() {
"--region", "us-east-1", "--enabled", "true"},
expectErr: true,
expectGetRequest: true,
expectRequest: cloudservice.UpdateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.UpdateAccountAuditLogSinkRequest{
ResourceVersion: "123",
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "audit_log_01",
Expand All @@ -828,7 +828,7 @@ func (s *AccountTestSuite) TestUpdateAuditLogSink() {
"--region", "us-east-1", "--enabled", "true"},
expectErr: true,
expectGetRequest: true,
expectRequest: cloudservice.UpdateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.UpdateAccountAuditLogSinkRequest{
ResourceVersion: "123",
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "audit_log_01",
Expand All @@ -851,7 +851,7 @@ func (s *AccountTestSuite) TestUpdateAuditLogSink() {
"--service-account-email", "123456789012@TestProject.iam.gserviceaccount.com", "--topic-name", "TestTopic"},
expectErr: false,
expectGetRequest: true,
expectRequest: cloudservice.UpdateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.UpdateAccountAuditLogSinkRequest{
ResourceVersion: "123",
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "audit_log_01",
Expand All @@ -873,7 +873,7 @@ func (s *AccountTestSuite) TestUpdateAuditLogSink() {
"--service-account-email", "123456789012@TestProject.iam.gserviceaccount.com", "--topic-name", "TestTopic", "--resource-version", "345"},
expectErr: false,
expectGetRequest: true,
expectRequest: cloudservice.UpdateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.UpdateAccountAuditLogSinkRequest{
ResourceVersion: "345",
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "audit_log_01",
Expand All @@ -891,7 +891,7 @@ func (s *AccountTestSuite) TestUpdateAuditLogSink() {
}
for _, tc := range tests {
s.Run(tc.name, func() {
if tc.expectRequest != (cloudservice.UpdateAccountAuditLogSinkRequest{}) {
if tc.expectRequest != nil {
if tc.expectGetRequest {
sinkType := ""
if len(tc.args) >= 3 {
Expand Down Expand Up @@ -939,7 +939,7 @@ func (s *AccountTestSuite) TestUpdateAuditLogSink() {
}, tc.getSinkError).Times(1)
}
if tc.getSinkError == nil {
s.mockCloudApiClient.EXPECT().UpdateAccountAuditLogSink(gomock.Any(), &tc.expectRequest).Return(&cloudservice.UpdateAccountAuditLogSinkResponse{
s.mockCloudApiClient.EXPECT().UpdateAccountAuditLogSink(gomock.Any(), tc.expectRequest).Return(&cloudservice.UpdateAccountAuditLogSinkResponse{
AsyncOperation: &operation.AsyncOperation{
Id: "123",
},
Expand All @@ -961,7 +961,7 @@ func (s *AccountTestSuite) TestDeleteAuditLogSink() {
name string
args []string
expectErr bool
expectRequest cloudservice.DeleteAccountAuditLogSinkRequest
expectRequest *cloudservice.DeleteAccountAuditLogSinkRequest
expectGetRequest bool
deleteError error
getSinkError error
Expand All @@ -971,7 +971,7 @@ func (s *AccountTestSuite) TestDeleteAuditLogSink() {
args: []string{"a", "al", "kinesis", "delete", "--sink-name", "audit_log_01"},
expectErr: false,
expectGetRequest: true,
expectRequest: cloudservice.DeleteAccountAuditLogSinkRequest{
expectRequest: &cloudservice.DeleteAccountAuditLogSinkRequest{
ResourceVersion: "123",
Name: "audit_log_01",
},
Expand All @@ -980,7 +980,7 @@ func (s *AccountTestSuite) TestDeleteAuditLogSink() {
name: "delete audit log sink uses provided resource version",
args: []string{"a", "al", "kinesis", "delete", "--sink-name", "audit_log_01", "--resource-version", "345"},
expectErr: false,
expectRequest: cloudservice.DeleteAccountAuditLogSinkRequest{
expectRequest: &cloudservice.DeleteAccountAuditLogSinkRequest{
ResourceVersion: "345",
Name: "audit_log_01",
},
Expand All @@ -990,7 +990,7 @@ func (s *AccountTestSuite) TestDeleteAuditLogSink() {
args: []string{"a", "al", "kinesis", "delete", "--sink-name", "audit_log_01"},
expectErr: true,
expectGetRequest: true,
expectRequest: cloudservice.DeleteAccountAuditLogSinkRequest{
expectRequest: &cloudservice.DeleteAccountAuditLogSinkRequest{
ResourceVersion: "123",
Name: "audit_log_01",
},
Expand All @@ -1001,7 +1001,7 @@ func (s *AccountTestSuite) TestDeleteAuditLogSink() {
args: []string{"a", "al", "kinesis", "delete", "--sink-name", "audit_log_01"},
expectErr: true,
expectGetRequest: true,
expectRequest: cloudservice.DeleteAccountAuditLogSinkRequest{
expectRequest: &cloudservice.DeleteAccountAuditLogSinkRequest{
ResourceVersion: "123",
Name: "audit_log_01",
},
Expand All @@ -1010,7 +1010,7 @@ func (s *AccountTestSuite) TestDeleteAuditLogSink() {
}
for _, tc := range tests {
s.Run(tc.name, func() {
if tc.expectRequest != (cloudservice.DeleteAccountAuditLogSinkRequest{}) {
if tc.expectRequest != nil {
if tc.expectGetRequest {
s.mockCloudApiClient.EXPECT().GetAccountAuditLogSink(gomock.Any(), &cloudservice.GetAccountAuditLogSinkRequest{
Name: "audit_log_01",
Expand All @@ -1021,7 +1021,7 @@ func (s *AccountTestSuite) TestDeleteAuditLogSink() {
}, tc.getSinkError).Times(1)
}
if tc.getSinkError == nil {
s.mockCloudApiClient.EXPECT().DeleteAccountAuditLogSink(gomock.Any(), &tc.expectRequest).Return(&cloudservice.DeleteAccountAuditLogSinkResponse{
s.mockCloudApiClient.EXPECT().DeleteAccountAuditLogSink(gomock.Any(), tc.expectRequest).Return(&cloudservice.DeleteAccountAuditLogSinkResponse{
AsyncOperation: &operation.AsyncOperation{
Id: "123",
},
Expand All @@ -1043,7 +1043,7 @@ func (s *AccountTestSuite) TestValidateAuditLogSink() {
name string
args []string
expectErr bool
expectRequest cloudservice.ValidateAccountAuditLogSinkRequest
expectRequest *cloudservice.ValidateAccountAuditLogSinkRequest
validateError error
}{
{
Expand All @@ -1054,7 +1054,7 @@ func (s *AccountTestSuite) TestValidateAuditLogSink() {
"--destination-uri", "arn:aws:kinesis:us-east-1:123456789012:stream/TestStream",
"--region", "us-east-1"},
expectErr: false,
expectRequest: cloudservice.ValidateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.ValidateAccountAuditLogSinkRequest{
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "test-sink",
Enabled: true,
Expand All @@ -1076,7 +1076,7 @@ func (s *AccountTestSuite) TestValidateAuditLogSink() {
"--destination-uri", "arn:aws:kinesis:us-east-1:123456789012:stream/TestStream",
"--region", "us-east-1"},
expectErr: true,
expectRequest: cloudservice.ValidateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.ValidateAccountAuditLogSinkRequest{
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "test-sink",
Enabled: true,
Expand All @@ -1097,7 +1097,7 @@ func (s *AccountTestSuite) TestValidateAuditLogSink() {
"--sink-name", "test-sink",
"--service-account-email", "123456789012@TestProject.iam.gserviceaccount.com", "--topic-name", "TestTopic"},
expectErr: false,
expectRequest: cloudservice.ValidateAccountAuditLogSinkRequest{
expectRequest: &cloudservice.ValidateAccountAuditLogSinkRequest{
Spec: &cloudaccount.AuditLogSinkSpec{
Name: "test-sink",
Enabled: true,
Expand All @@ -1114,8 +1114,8 @@ func (s *AccountTestSuite) TestValidateAuditLogSink() {
}
for _, tc := range tests {
s.Run(tc.name, func() {
if tc.expectRequest != (cloudservice.ValidateAccountAuditLogSinkRequest{}) {
s.mockCloudApiClient.EXPECT().ValidateAccountAuditLogSink(gomock.Any(), &tc.expectRequest).Return(&cloudservice.ValidateAccountAuditLogSinkResponse{}, tc.validateError).Times(1)
if tc.expectRequest != nil {
s.mockCloudApiClient.EXPECT().ValidateAccountAuditLogSink(gomock.Any(), tc.expectRequest).Return(&cloudservice.ValidateAccountAuditLogSinkResponse{}, tc.validateError).Times(1)
}
err := s.RunCmd(tc.args...)
if tc.expectErr {
Expand All @@ -1132,20 +1132,20 @@ func (s *AccountTestSuite) TestListAuditLogSinks() {
name string
args []string
expectErr bool
expectRequest cloudservice.GetAccountAuditLogSinksRequest
expectRequest *cloudservice.GetAccountAuditLogSinksRequest
listError error
}{
{
name: "list sinks succeeds",
args: []string{"a", "al", "kinesis", "list"},
expectErr: false,
expectRequest: cloudservice.GetAccountAuditLogSinksRequest{},
expectRequest: &cloudservice.GetAccountAuditLogSinksRequest{},
},
{
name: "list sinks with error",
args: []string{"a", "al", "kinesis", "list"},
expectErr: true,
expectRequest: cloudservice.GetAccountAuditLogSinksRequest{},
expectRequest: &cloudservice.GetAccountAuditLogSinksRequest{},
listError: fmt.Errorf("error"),
},
}
Expand All @@ -1167,30 +1167,30 @@ func (s *AccountTestSuite) TestGetAuditLogSink() {
name string
args []string
expectErr bool
expectRequest cloudservice.GetAccountAuditLogSinkRequest
expectRequest *cloudservice.GetAccountAuditLogSinkRequest
getError error
}{
{
name: "get sink succeeds",
args: []string{"a", "al", "kinesis", "get", "--sink-name", "audit_log_01"},
expectErr: false,
expectRequest: cloudservice.GetAccountAuditLogSinkRequest{
expectRequest: &cloudservice.GetAccountAuditLogSinkRequest{
Name: "audit_log_01",
},
},
{
name: "get sink with error",
args: []string{"a", "al", "kinesis", "get", "--sink-name", "audit_log_01"},
expectErr: true,
expectRequest: cloudservice.GetAccountAuditLogSinkRequest{
expectRequest: &cloudservice.GetAccountAuditLogSinkRequest{
Name: "audit_log_01",
},
getError: fmt.Errorf("error"),
},
}
for _, tc := range tests {
s.Run(tc.name, func() {
s.mockCloudApiClient.EXPECT().GetAccountAuditLogSink(gomock.Any(), &tc.expectRequest).Return(&cloudservice.GetAccountAuditLogSinkResponse{}, tc.getError).Times(1)
s.mockCloudApiClient.EXPECT().GetAccountAuditLogSink(gomock.Any(), tc.expectRequest).Return(&cloudservice.GetAccountAuditLogSinkResponse{}, tc.getError).Times(1)
err := s.RunCmd(tc.args...)
if tc.expectErr {
s.Error(err)
Expand Down
12 changes: 3 additions & 9 deletions app/apikey.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"time"

"github.com/gogo/protobuf/types"
"github.com/temporalio/tcld/protogen/api/auth/v1"
"github.com/temporalio/tcld/protogen/api/authservice/v1"
"github.com/temporalio/tcld/utils"
"github.com/urfave/cli/v2"
"google.golang.org/protobuf/types/known/timestamppb"
)

const (
Expand Down Expand Up @@ -64,10 +64,7 @@ func (s *APIKeyClient) createAPIKey(
expiry time.Time,
requestID string,
) error {
expiryts, err := types.TimestampProto(expiry)
if err != nil {
return fmt.Errorf("failed to convert timestamp to proto: %w", err)
}
expiryts := timestamppb.New(expiry)
resp, err := s.client.CreateAPIKey(s.ctx, &authservice.CreateAPIKeyRequest{
Spec: &auth.APIKeySpec{
AccessType: auth.APIKEY_ACCESS_TYPE_INHERIT_OWNER_ACCESS,
Expand All @@ -91,10 +88,7 @@ func (s *APIKeyClient) createServiceAccountAPIKey(
expiry time.Time,
requestID string,
) error {
expiryts, err := types.TimestampProto(expiry)
if err != nil {
return fmt.Errorf("failed to convert timestamp to proto: %w", err)
}
expiryts := timestamppb.New(expiry)
resp, err := s.client.CreateServiceAccountAPIKey(s.ctx, &authservice.CreateServiceAccountAPIKeyRequest{
ServiceAccountId: serviceAccountID,
Spec: &auth.APIKeySpec{
Expand Down
2 changes: 1 addition & 1 deletion app/ca_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func generateCertificateHelper(
}

func generateRootX509CAForTest() (string, error) {
tlsCert, _, err := generateCertificateHelper("Temporal Development", nil, nil, nil, true, 512, x509.SHA256WithRSA)
tlsCert, _, err := generateCertificateHelper("Temporal Development", nil, nil, nil, true, 2048, x509.SHA256WithRSA)
if err != nil {
return "", err
}
Expand Down
2 changes: 1 addition & 1 deletion app/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"strings"

apipayload "github.com/temporalio/tcld/protogen/temporal/api/common/v1"
apipayload "go.temporal.io/api/common/v1"
"github.com/urfave/cli/v2"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down
Loading