[create-pull-request] automated change

chronosphereio · Jun 27, 2024 · a5fd195 · a5fd195
1 parent 45e2151
commit a5fd195
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 27 deletions.
diff --git a/client/client.go b/client/client.go
@@ -23,7 +23,7 @@ const (
 	DefaultBaseURL    = "https://cloud-api.calyptia.com"
 	uintBase          = 10
 	CalyptiaEnvAPIURL = "CALYPTIA_API_URL"
-	//nolint: gosec // no credential leaks just a variable.
+	//nolint:gosec // no credential leaks just a variable.
 	CalyptiaEnvAPIToken = "CALYPTIA_API_TOKEN"
 )
 

diff --git a/client/fleet.go b/client/fleet.go
@@ -85,9 +85,7 @@ func (c *Client) FleetConfig(ctx context.Context, fleetID string, params types.F
 			return nil, err
 		}
 		return &cfg, nil
-	case types.ConfigFormatYAML:
-		fallthrough
-	case types.ConfigFormatJSON:
+	case types.ConfigFormatYAML, types.ConfigFormatJSON:
 		var out fluentbitconfig.Config
 		return &out, c.do(ctx, http.MethodGet, path, nil, &out)
 	}

diff --git a/client/secrets/rsa.go b/client/secrets/rsa.go
@@ -28,7 +28,7 @@ func NewRSAHandler(bits int) *RSA {
 	return &RSA{Bits: bits}
 }
 
-func (r *RSA) EncryptWithPublicKey(msg []byte, key []byte) ([]byte, error) {
+func (r *RSA) EncryptWithPublicKey(msg, key []byte) ([]byte, error) {
 	publicKey, err := BytesToPublicKey(key)
 	if err != nil {
 		return nil, err
@@ -100,7 +100,7 @@ func Decrypt(hash hash.Hash, privateKey *rsa.PrivateKey, msg []byte) ([]byte, er
 	return plaintext, nil
 }
 
-func (r *RSA) DecryptWithPrivateKey(msg []byte, key []byte) ([]byte, error) {
+func (r *RSA) DecryptWithPrivateKey(msg, key []byte) ([]byte, error) {
 	privateKey, err := BytesToPrivateKey(key)
 	if err != nil {
 		return nil, err
@@ -113,7 +113,7 @@ func (r *RSA) DecryptWithPrivateKey(msg []byte, key []byte) ([]byte, error) {
 	return plaintext, nil
 }
 
-func (r *RSA) GenerateKeyPair() ([]byte, []byte, error) {
+func (r *RSA) GenerateKeyPair() (priv, pub []byte, err error) {
 	privateKey, err := rsa.GenerateKey(rand.Reader, r.Bits)
 	if err != nil {
 		return nil, nil, err

diff --git a/types/metric.go b/types/metric.go
@@ -183,10 +183,6 @@ type MetricsOutput struct {
 	RetriedRecords float64 `json:"retriedRecords"`
 	RetriesFailed  float64 `json:"retriesFailed"`
 	DroppedRecords float64 `json:"droppedRecords"`
-
-	// Deprecated: `load` is not a valid counter metric.
-	// TODO: review `load` output metrics as they might not even exists in the first place.
-	Loads float64 `json:"loads"`
 }
 
 // MetricsOverTime stores a list of metrics over time for a core instance.
@@ -253,10 +249,6 @@ type MetricsOverTimeOutput struct {
 	RetriedRecords []MetricOverTime `json:"retriedRecords"`
 	RetriesFailed  []MetricOverTime `json:"retriesFailed"`
 	DroppedRecords []MetricOverTime `json:"droppedRecords"`
-
-	// Deprecated: `load` is not a valid counter metric.
-	// TODO: review `load` output metrics as they might not even exists in the first place.
-	Loads []MetricOverTime `json:"loads"`
 }
 
 func (m *MetricsOverTimeOutput) Init() {
@@ -281,9 +273,6 @@ func (m *MetricsOverTimeOutput) Init() {
 	if m.DroppedRecords == nil {
 		m.DroppedRecords = []MetricOverTime{}
 	}
-	if m.Loads == nil {
-		m.Loads = []MetricOverTime{}
-	}
 }
 
 type MetricOverTime struct {

diff --git a/types/pipeline.go b/types/pipeline.go
@@ -182,11 +182,6 @@ type CreatePipeline struct {
 	Metadata             *json.RawMessage       `json:"metadata"`
 	Tags                 []string               `json:"tags"`
 
-	// Deprecated: in favor of NoAutoCreateEndpointsFromConfig
-	AutoCreatePortsFromConfig bool `json:"autoCreatePortsFromConfig"`
-	// Deprecated: in favor of NoAutoCreateChecksFromConfig
-	AutoCreateChecksFromConfig bool `json:"autoCreateChecksFromConfig"`
-
 	// no automatically create endpoints from config
 	NoAutoCreateEndpointsFromConfig bool `json:"noAutoCreateEndpointsFromConfig"`
 	// no automatically create checks based on the output configuration.
@@ -343,10 +338,6 @@ type UpdatePipeline struct {
 	RawConfig          *string             `json:"rawConfig"`
 	ResourceProfile    *string             `json:"resourceProfile"`
 	Image              *string             `json:"image"`
-	// Deprecated: in favor of NoAutoCreateEndpointsFromConfig
-	AutoCreatePortsFromConfig *bool `json:"autoCreatePortsFromConfig"`
-	// Deprecated: in favor of NoAutoCreateChecksFromConfig
-	AutoCreateChecksFromConfig *bool `json:"autoCreateChecksFromConfig"`
 
 	// no automatically create endpoints from config
 	NoAutoCreateEndpointsFromConfig bool `json:"noAutoCreateEndpointsFromConfig"`