Skip to content

Commit

Permalink
Change the argument name to
Browse files Browse the repository at this point in the history
Signed-off-by: dttung2905 <ttdao.2015@accountancy.smu.edu.sg>
  • Loading branch information
dttung2905 committed May 17, 2023
1 parent 6a1aabe commit 99ce5e4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions pkg/scalers/external_scaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ type externalPushScaler struct {
}

type externalScalerMetadata struct {
scalerAddress string
tlsCertFile string
originalMetadata map[string]string
scalerIndex int
caCert string
tlsClientCert string
tlsClientKey string
insecureSkipVerify bool
scalerAddress string
tlsCertFile string
originalMetadata map[string]string
scalerIndex int
caCert string
tlsClientCert string
tlsClientKey string
unsafeSsl bool
}

type connectionGroup struct {
Expand Down Expand Up @@ -130,13 +130,13 @@ func parseExternalScalerMetadata(config *ScalerConfig) (externalScalerMetadata,
meta.tlsClientKey = val
}

meta.insecureSkipVerify = false
if val, ok := config.TriggerMetadata["insecureSkipVerify"]; ok && val != "" {
meta.unsafeSsl = false
if val, ok := config.TriggerMetadata["unsafeSsl"]; ok && val != "" {
boolVal, err := strconv.ParseBool(val)
if err != nil {
return meta, fmt.Errorf("failed to parse insecureSkipVerify value. Must be either true or false")
}
meta.insecureSkipVerify = boolVal
meta.unsafeSsl = boolVal
}
// Add elements to metadata
for key, value := range config.TriggerMetadata {
Expand Down Expand Up @@ -314,7 +314,7 @@ func getClientForConnectionPool(metadata externalScalerMetadata, logger logr.Log
return grpc.Dial(metadata.scalerAddress, grpc.WithTransportCredentials(creds))
}

tlsConfig, err := util.NewTLSConfig(metadata.tlsClientCert, metadata.tlsClientKey, metadata.caCert, metadata.insecureSkipVerify)
tlsConfig, err := util.NewTLSConfig(metadata.tlsClientCert, metadata.tlsClientKey, metadata.caCert, metadata.unsafeSsl)
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/scalers/external_scaler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ func TestExternalScalerParseMetadata(t *testing.T) {
t.Error("Expected success but got error", err)
}

if testData.metadata["insecureSkipVerify"] == "true" && !metadata.insecureSkipVerify {
t.Error("Expected insecureSkipVerify to be true but got", metadata.insecureSkipVerify)
if testData.metadata["unsafeSsl"] == "true" && !metadata.unsafeSsl {
t.Error("Expected unsafeSsl to be true but got", metadata.unsafeSsl)
}
if testData.isError && err == nil {
t.Error("Expected error but got success")
Expand Down

0 comments on commit 99ce5e4

Please sign in to comment.