Skip to content

Commit

Permalink
[PLAT-15438] Mark AWS CloudWatch fields as required in DBAL
Browse files Browse the repository at this point in the history
Summary: Mark AWS CloudWatch fields as required when creating a telemetry provider.

Test Plan:
Manually tested.
Run UTs.
Run itests.

Reviewers: amalyshev

Reviewed By: amalyshev

Subscribers: svc_phabricator, yugaware

Differential Revision: https://phorge.dev.yugabyte.com/D38756
  • Loading branch information
Sahith02 committed Dec 7, 2024
1 parent dab181b commit 0dc4f95
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import play.data.validation.Constraints;

@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(description = "AWSCloudWatchConfig Config")
public class AWSCloudWatchConfig extends TelemetryProviderConfig {

@ApiModelProperty(value = "Log Group", accessMode = READ_WRITE)
@ApiModelProperty(value = "Log Group", accessMode = READ_WRITE, required = true)
@Constraints.Required(message = "Log Group is required")
private String logGroup;

@ApiModelProperty(value = "Log Stream", accessMode = READ_WRITE)
@ApiModelProperty(value = "Log Stream", accessMode = READ_WRITE, required = true)
@Constraints.Required(message = "Log Stream is required")
private String logStream;

@ApiModelProperty(value = "Region", accessMode = READ_WRITE)
@ApiModelProperty(value = "Region", accessMode = READ_WRITE, required = true)
@Constraints.Required(message = "Region is required")
private String region;

@ApiModelProperty(value = "Role ARN", accessMode = READ_WRITE)
Expand All @@ -27,10 +31,12 @@ public class AWSCloudWatchConfig extends TelemetryProviderConfig {
@ApiModelProperty(value = "End Point", accessMode = READ_WRITE)
private String endpoint;

@ApiModelProperty(value = "Access Key", accessMode = READ_WRITE)
@ApiModelProperty(value = "Access Key", accessMode = READ_WRITE, required = true)
@Constraints.Required(message = "Access Key is required")
private String accessKey;

@ApiModelProperty(value = "Secret Key", accessMode = READ_WRITE)
@ApiModelProperty(value = "Secret Key", accessMode = READ_WRITE, required = true)
@Constraints.Required(message = "Secret Key is required")
private String secretKey;

public AWSCloudWatchConfig() {
Expand Down
1 change: 1 addition & 0 deletions managed/src/main/resources/swagger-strict.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"type" : "string"
}
},
"required" : [ "accessKey", "logGroup", "logStream", "region", "secretKey" ],
"type" : "object"
} ]
},
Expand Down
1 change: 1 addition & 0 deletions managed/src/main/resources/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"type" : "string"
}
},
"required" : [ "accessKey", "logGroup", "logStream", "region", "secretKey" ],
"type" : "object"
} ]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ export const ExportLogModalForm: FC<ExportLogFormProps> = ({ open, onClose, form
<YBLabel>{t('exportAuditLog.awsAccessKey')}</YBLabel>
<YBInputField
control={control}
rules={{ required: 'This field is required' }}
name="config.accessKey"
fullWidth
disabled={isViewMode}
Expand All @@ -286,6 +287,7 @@ export const ExportLogModalForm: FC<ExportLogFormProps> = ({ open, onClose, form
<YBLabel>{t('exportAuditLog.awsSecretKey')}</YBLabel>
<YBInputField
control={control}
rules={{ required: 'This field is required' }}
name="config.secretKey"
fullWidth
disabled={isViewMode}
Expand All @@ -298,6 +300,7 @@ export const ExportLogModalForm: FC<ExportLogFormProps> = ({ open, onClose, form
<YBLabel>{t('exportAuditLog.logGroup')}</YBLabel>
<YBInputField
control={control}
rules={{ required: 'This field is required' }}
name="config.logGroup"
fullWidth
disabled={isViewMode}
Expand All @@ -310,6 +313,7 @@ export const ExportLogModalForm: FC<ExportLogFormProps> = ({ open, onClose, form
<YBLabel>{t('exportAuditLog.logStream')}</YBLabel>
<YBInputField
control={control}
rules={{ required: 'This field is required' }}
name="config.logStream"
fullWidth
disabled={isViewMode}
Expand Down

0 comments on commit 0dc4f95

Please sign in to comment.