Skip to content

Commit

Permalink
fix: typo in env var
Browse files Browse the repository at this point in the history
  • Loading branch information
ansgarschulte committed Sep 25, 2023
1 parent 1efcb8d commit fac35a3
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ reported.
| `STEADYBIT_EXTENSION_DISCOVERY_DISABLED_LAMBDA` | Disable Lambda-Discovery and all Lambda related definitions | no | false |
| `STEADYBIT_EXTENSION_DISCOVERY_INTERVAL_LAMBDA` | Discovery-Interval in seconds | no | 60 |
| `STEADYBIT_EXTENSION_ENRICH_EC2_DATA_FOR_TARGET_TYPES` | These target types will be enriched with EC2 data. They must have the `host.hostname` attribute for this | no | com.steadybit.extension_jvm.application,com.steadybit.extension_container.container,com.steadybit.extension_kubernetes.kubernetes-deployment |
| `STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTE_EXCLUDES_EC2` | List of EC2 Target Attributes which will be excluded during discovery. Checked by key equality and supporting trailing "*" | no | |
| `STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTE_EXCLUDES_ZONE` | List of Availibilty Zone Target Attributes which will be excluded during discovery. Checked by key equality and supporting trailing "*" | no | |
| `STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTE_EXCLUDES_FIS` | List of FIS Target Attributes which will be excluded during discovery. Checked by key equality and supporting trailing "*" | no | |
| `STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTE_EXCLUDES_LAMBDA` | List of Lambda Target Attributes which will be excluded during discovery. Checked by key equality and supporting trailing "*" | no | |
| `STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTE_EXCLUDES_RDS` | List of RDS Target Attributes which will be excluded during discovery. Checked by key equality and supporting trailing "*" | no | |
| `STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_EC2` | List of EC2 Target Attributes which will be excluded during discovery. Checked by key equality and supporting trailing "*" | no | |
| `STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_ZONE` | List of Availibilty Zone Target Attributes which will be excluded during discovery. Checked by key equality and supporting trailing "*" | no | |
| `STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_FIS` | List of FIS Target Attributes which will be excluded during discovery. Checked by key equality and supporting trailing "*" | no | |
| `STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_LAMBDA` | List of Lambda Target Attributes which will be excluded during discovery. Checked by key equality and supporting trailing "*" | no | |
| `STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_RDS` | List of RDS Target Attributes which will be excluded during discovery. Checked by key equality and supporting trailing "*" | no | |

### Authentication

Expand Down
10 changes: 5 additions & 5 deletions charts/steadybit-extension-aws/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,23 +68,23 @@ spec:
- name: STEADYBIT_EXTENSION_ASSUME_ROLES
value: {{ join "," .Values.aws.assumeRoles | quote }}
{{- if .Values.aws.discovery.attributes.excludes.ec2 }}
- name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTE_EXCLUDES_EC2
- name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_EC2
value: {{ join "," .Values.aws.discovery.attributes.excludes.ec2 | quote }}
{{- end }}
{{- if .Values.aws.discovery.attributes.excludes.zone }}
- name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTE_EXCLUDES_ZONE
- name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_ZONE
value: {{ join "," .Values.aws.discovery.attributes.excludes.zone | quote }}
{{- end }}
{{- if .Values.aws.discovery.attributes.excludes.fis }}
- name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTE_EXCLUDES_FIS
- name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_FIS
value: {{ join "," .Values.aws.discovery.attributes.excludes.fis | quote }}
{{- end }}
{{- if .Values.aws.discovery.attributes.excludes.lambda }}
- name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTE_EXCLUDES_LAMBDA
- name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_LAMBDA
value: {{ join "," .Values.aws.discovery.attributes.excludes.lambda | quote }}
{{- end }}
{{- if .Values.aws.discovery.attributes.excludes.rds }}
- name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTE_EXCLUDES_RDS
- name: STEADYBIT_EXTENSION_DISCOVERY_ATTRIBUTES_EXCLUDES_RDS
value: {{ join "," .Values.aws.discovery.attributes.excludes.rds | quote }}
{{- end }}
{{- with .Values.extraEnv }}
Expand Down
10 changes: 5 additions & 5 deletions config/specification.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ type Specification struct {
DiscoveryIntervalFis int `json:"discoveryIntervalFis" split_words:"true" required:"false" default:"300"`
DiscoveryIntervalLambda int `json:"discoveryIntervalLambda" split_words:"true" required:"false" default:"60"`
EnrichEc2DataForTargetTypes []string `json:"EnrichEc2DataForTargetTypes" split_words:"true" default:"com.steadybit.extension_jvm.application,com.steadybit.extension_container.container,com.steadybit.extension_kubernetes.kubernetes-deployment"`
DiscoveryAttributeExcludesEc2 []string `json:"discoveryAttributeExcludesEc2" split_words:"true" required:"false"`
DiscoveryAttributeExcludesZone []string `json:"discoveryAttributeExcludesZone" split_words:"true" required:"false"`
DiscoveryAttributeExcludesFis []string `json:"discoveryAttributeExcludesFis" split_words:"true" required:"false"`
DiscoveryAttributeExcludesLambda []string `json:"discoveryAttributeExcludesLambda" split_words:"true" required:"false"`
DiscoveryAttributeExcludesRds []string `json:"discoveryAttributeExcludesRds" split_words:"true" required:"false"`
DiscoveryAttributesExcludesEc2 []string `json:"discoveryAttributesExcludesEc2" split_words:"true" required:"false"`
DiscoveryAttributesExcludesZone []string `json:"discoveryAttributesExcludesZone" split_words:"true" required:"false"`
DiscoveryAttributesExcludesFis []string `json:"discoveryAttributesExcludesFis" split_words:"true" required:"false"`
DiscoveryAttributesExcludesLambda []string `json:"discoveryAttributesExcludesLambda" split_words:"true" required:"false"`
DiscoveryAttributesExcludesRds []string `json:"discoveryAttributesExcludesRds" split_words:"true" required:"false"`
}
2 changes: 1 addition & 1 deletion extaz/availablity_zone_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func GetAllAvailabilityZones(ctx context.Context, ec2Api AZDescribeAvailabilityZ
result = append(result, toTarget(availabilityZone, awsAccountNumber))
}

return discovery_kit_api.ApplyAttributeExcludes(result, config.Config.DiscoveryAttributeExcludesZone), nil
return discovery_kit_api.ApplyAttributeExcludes(result, config.Config.DiscoveryAttributesExcludesZone), nil
}

func toTarget(availabilityZone types2.AvailabilityZone, awsAccountNumber string) discovery_kit_api.Target {
Expand Down
2 changes: 1 addition & 1 deletion extec2/instance_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ func GetAllEc2Instances(ctx context.Context, ec2Api Ec2DescribeInstancesApi, aws
}
}

return discovery_kit_api.ApplyAttributeExcludes(result, config.Config.DiscoveryAttributeExcludesEc2), nil
return discovery_kit_api.ApplyAttributeExcludes(result, config.Config.DiscoveryAttributesExcludesEc2), nil
}

func toTarget(ec2Instance types.Instance, awsAccountNumber string, awsRegion string) discovery_kit_api.Target {
Expand Down
2 changes: 1 addition & 1 deletion extec2/instance_discovery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func TestGetAllEc2Instances(t *testing.T) {
func TestGetAllEc2InstancesWithFilteredAttributes(t *testing.T) {
// Given
// set env var to filter out all attributes starting with "aws-ec2"
config.Config.DiscoveryAttributeExcludesEc2 = []string{"aws-ec2.label.*", "aws-ec2.image"}
config.Config.DiscoveryAttributesExcludesEc2 = []string{"aws-ec2.label.*", "aws-ec2.image"}
mockedApi := new(ec2ClientMock)
mockedReturnValue := ec2.DescribeInstancesOutput{
Reservations: []types.Reservation{
Expand Down
2 changes: 1 addition & 1 deletion extfis/template_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func GetAllFisTemplates(ctx context.Context, fisApi FisApi, awsAccountNumber str
}
}

return discovery_kit_api.ApplyAttributeExcludes(result, config.Config.DiscoveryAttributeExcludesFis), nil
return discovery_kit_api.ApplyAttributeExcludes(result, config.Config.DiscoveryAttributesExcludesFis), nil
}

func toTarget(template types.ExperimentTemplateSummary, awsAccountNumber string, awsRegion string, totalDuration *time.Duration) discovery_kit_api.Target {
Expand Down
2 changes: 1 addition & 1 deletion extlambda/discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ func getAllAwsLambdaFunctions(ctx context.Context, client lambda.ListFunctionsAP
marker = output.NextMarker
}
}
return extutil.Ptr(discovery_kit_api.ApplyAttributeExcludes(result, config.Config.DiscoveryAttributeExcludesLambda)), nil
return extutil.Ptr(discovery_kit_api.ApplyAttributeExcludes(result, config.Config.DiscoveryAttributesExcludesLambda)), nil
}

func toTarget(function types.FunctionConfiguration, awsAccountNumber string, awsAccountRegion string) discovery_kit_api.Target {
Expand Down
2 changes: 1 addition & 1 deletion extrds/instance_discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func GetAllRdsInstances(ctx context.Context, rdsApi rdsDBInstanceApi, awsAccount
}
}

return discovery_kit_api.ApplyAttributeExcludes(result, config.Config.DiscoveryAttributeExcludesRds), nil
return discovery_kit_api.ApplyAttributeExcludes(result, config.Config.DiscoveryAttributesExcludesRds), nil
}

func toInstanceTarget(dbInstance types.DBInstance, awsAccountNumber string, awsRegion string) discovery_kit_api.Target {
Expand Down

0 comments on commit fac35a3

Please sign in to comment.