remove consul from interface names

Author: ncode

cmd/cleanup_test.go

@@ -305,14 +305,14 @@ func TestCleanupCmdSuccessFlow(t *testing.T) {
 
 // MockConsulClient for testing
 type MockConsulClient struct {
-	MockAgent consul.ConsulAgent
+	MockAgent consul.Agent
 }
 
-func (m *MockConsulClient) Agent() consul.ConsulAgent {
+func (m *MockConsulClient) Agent() consul.Agent {
 	return m.MockAgent
 }
 
-// MockAgent implements the ConsulAgent interface
+// MockAgent implements the Agent interface
 type MockAgent struct {
 	ServiceFunc         func(serviceID string, q *api.QueryOptions) (*api.AgentService, *api.QueryMeta, error)
 	ServiceRegisterFunc func(reg *api.AgentServiceRegistration) error

pkg/consul/factory.go

@@ -21,42 +21,42 @@ import (
 	"github.com/hashicorp/consul/api"
 )
 
-// ConsulClient is an interface for the Consul client.
-type ConsulClient interface {
-	Agent() ConsulAgent
+// Client is an interface for the Consul client.
+type Client interface {
+	Agent() Agent
 }
 
-// ConsulAgent is an interface for the Consul agent.
-type ConsulAgent interface {
+// Agent is an interface for the Consul agent.
+type Agent interface {
 	Service(string, *api.QueryOptions) (*api.AgentService, *api.QueryMeta, error)
 	ServiceRegister(*api.AgentServiceRegistration) error
 }
 
-// ConsulAPIWrapper wraps the Consul API client to conform to the ConsulClient interface.
-type ConsulAPIWrapper struct {
+// ApiWrapper wraps the Consul API client to conform to the Client interface.
+type ApiWrapper struct {
 	client *api.Client
 }
 
-// NewConsulAPIWrapper creates a new instance of ConsulAPIWrapper.
-func NewConsulAPIWrapper(client *api.Client) *ConsulAPIWrapper {
-	return &ConsulAPIWrapper{client: client}
+// NewConsulAPIWrapper creates a new instance of ApiWrapper.
+func NewConsulAPIWrapper(client *api.Client) *ApiWrapper {
+	return &ApiWrapper{client: client}
 }
 
-// Agent returns an object that conforms to the ConsulAgent interface.
-func (w *ConsulAPIWrapper) Agent() ConsulAgent {
+// Agent returns an object that conforms to the Agent interface.
+func (w *ApiWrapper) Agent() Agent {
 	return w.client.Agent()
 }
 
 // ClientFactory is an interface for creating Consul clients
 type ClientFactory interface {
-	NewClient(address, token string) (ConsulClient, error)
+	NewClient(address, token string) (Client, error)
 }
 
 // DefaultFactory creates real Consul clients
 type DefaultFactory struct{}
 
 // NewClient creates a new Consul client with the given configuration
-func (f *DefaultFactory) NewClient(address, token string) (ConsulClient, error) {
+func (f *DefaultFactory) NewClient(address, token string) (Client, error) {
 	config := api.DefaultConfig()
 	config.Address = address
 	config.Token = token
@@ -71,12 +71,12 @@ func (f *DefaultFactory) NewClient(address, token string) (ConsulClient, error)
 
 // MockFactory creates mock Consul clients for testing
 type MockFactory struct {
-	MockClient ConsulClient
+	MockClient Client
 	MockError  error
 }
 
 // NewClient returns the mock client or error
-func (f *MockFactory) NewClient(address, token string) (ConsulClient, error) {
+func (f *MockFactory) NewClient(address, token string) (Client, error) {
 	if f.MockError != nil {
 		return nil, f.MockError
 	}
@@ -97,6 +97,6 @@ func ResetFactory() {
 }
 
 // CreateClient is a convenience function that uses the global factory
-func CreateClient(address, token string) (ConsulClient, error) {
+func CreateClient(address, token string) (Client, error) {
 	return Factory.NewClient(address, token)
-}
+}

pkg/consul/factory_test.go

@@ -13,7 +13,7 @@ type MockConsulClient struct {
 	MockAgent *MockAgent
 }
 
-func (m *MockConsulClient) Agent() ConsulAgent {
+func (m *MockConsulClient) Agent() Agent {
 	return m.MockAgent
 }
 
@@ -120,4 +120,4 @@ func TestGlobalFactory(t *testing.T) {
 		_, ok := Factory.(*DefaultFactory)
 		assert.True(t, ok, "Factory should be reset to DefaultFactory")
 	})
-}
+}

pkg/tagit/tagit.go

@@ -20,12 +20,11 @@ type TagIt struct {
 	Script          string
 	Interval        time.Duration
 	TagPrefix       string
-	client          consul.ConsulClient
+	client          consul.Client
 	commandExecutor CommandExecutor
 	logger          *slog.Logger
 }
 
-
 // CommandExecutor is an interface for running commands.
 type CommandExecutor interface {
 	Execute(command string) ([]byte, error)
@@ -48,7 +47,7 @@ func (e *CmdExecutor) Execute(command string) ([]byte, error) {
 }
 
 // New creates a new TagIt struct.
-func New(consulClient consul.ConsulClient, commandExecutor CommandExecutor, serviceID string, script string, interval time.Duration, tagPrefix string, logger *slog.Logger) *TagIt {
+func New(consulClient consul.Client, commandExecutor CommandExecutor, serviceID string, script string, interval time.Duration, tagPrefix string, logger *slog.Logger) *TagIt {
 	return &TagIt{
 		ServiceID:       serviceID,
 		Script:          script,

pkg/tagit/tagit_test.go

@@ -15,12 +15,12 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-// MockConsulClient implements the ConsulClient interface for testing.
+// MockConsulClient implements the Client interface for testing.
 type MockConsulClient struct {
 	MockAgent *MockAgent
 }
 
-func (m *MockConsulClient) Agent() consul.ConsulAgent {
+func (m *MockConsulClient) Agent() consul.Agent {
 	return m.MockAgent
 }
 
@@ -607,21 +607,21 @@ func TestConsulInterfaceCompatibility(t *testing.T) {
 			return nil
 		},
 	}
-	
+
 	mockClient := &MockConsulClient{
 		MockAgent: mockAgent,
 	}
-	
-	// Verify that MockConsulClient implements consul.ConsulClient
-	var _ consul.ConsulClient = mockClient
-	
-	// Verify that MockAgent implements consul.ConsulAgent
-	var _ consul.ConsulAgent = mockAgent
-	
+
+	// Verify that MockConsulClient implements consul.Client
+	var _ consul.Client = mockClient
+
+	// Verify that MockAgent implements consul.Agent
+	var _ consul.Agent = mockAgent
+
 	// Test that the mock client works correctly
 	agent := mockClient.Agent()
 	assert.NotNil(t, agent, "Agent() should return non-nil")
-	
+
 	service, _, err := agent.Service("test-service", nil)
 	assert.NoError(t, err)
 	assert.Equal(t, "test-service", service.ID)