Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

W-15425041: release-fix: remove '.' in fields id and displayNames #1983

Merged
merged 1 commit into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,10 @@ object KafkaMessageBinding030Model extends KafkaMessageBindingModel {
override def modelInstance: AmfObject = KafkaMessageBinding030()

override def fields: List[Field] = List(
MessageKey,
SchemaIdLocation,
SchemaIdPayloadEncoding,
SchemaLookupStrategy,
BindingVersion
) ++ MessageBindingModel.fields
SchemaLookupStrategy
) ++ KafkaMessageBindingModel.fields

override val `type`: List[ValueType] = ApiBinding + "KafkaMessageBinding030" :: MessageBindingModel.`type`

Expand Down Expand Up @@ -220,8 +218,7 @@ object KafkaChannelBinding040Model extends KafkaChannelBindingModel {
)
)

override def fields: List[Field] =
List(Topic, Partitions, Replicas, TopicConfiguration, BindingVersion) ++ ChannelBindingModel.fields
override def fields: List[Field] = TopicConfiguration +: KafkaChannelBindingModel.fields
}

object KafkaChannelBinding050Model extends KafkaChannelBindingModel {
Expand All @@ -239,8 +236,7 @@ object KafkaChannelBinding050Model extends KafkaChannelBindingModel {
)
)

override def fields: List[Field] =
List(Topic, Partitions, Replicas, TopicConfiguration, BindingVersion) ++ ChannelBindingModel.fields
override def fields: List[Field] = TopicConfiguration +: KafkaChannelBindingModel.fields
}

trait KafkaTopicConfigurationModel extends DomainElementModel {
Expand All @@ -249,32 +245,32 @@ trait KafkaTopicConfigurationModel extends DomainElementModel {

val CleanupPolicy: Field = Field(
Array(Str),
ApiBinding + "cleanup.policy",
ModelDoc(ModelVocabularies.ApiBinding, "cleanup.policy", "The cleanup.policy configuration option.")
ApiBinding + "CleanupPolicy",
ModelDoc(ModelVocabularies.ApiBinding, "CleanupPolicy", "The cleanup.policy configuration option.")
)

val RetentionMs: Field = Field(
Int,
ApiBinding + "retention.ms",
ModelDoc(ModelVocabularies.ApiBinding, "retention.ms", "The retention.ms configuration option.")
ApiBinding + "RetentionMs",
ModelDoc(ModelVocabularies.ApiBinding, "RetentionMs", "The retention.ms configuration option.")
)

val RetentionBytes: Field = Field(
Int,
ApiBinding + "retention.bytes",
ModelDoc(ModelVocabularies.ApiBinding, "retention.bytes", "The retention.bytes configuration option.")
ApiBinding + "RetentionBytes",
ModelDoc(ModelVocabularies.ApiBinding, "RetentionBytes", "The retention.bytes configuration option.")
)

val DeleteRetentionMs: Field = Field(
Int,
ApiBinding + "delete.retention.ms",
ModelDoc(ModelVocabularies.ApiBinding, "delete.retention.ms", "The delete.retention.ms configuration option.")
ApiBinding + "DeleteRetentionMs",
ModelDoc(ModelVocabularies.ApiBinding, "DeleteRetentionMs", "The delete.retention.ms configuration option.")
)

val MaxMessageBytes: Field = Field(
Int,
ApiBinding + "max.message.bytes",
ModelDoc(ModelVocabularies.ApiBinding, "max.message.bytes", "The max.message.bytes configuration option.")
ApiBinding + "MaxMessageBytes",
ModelDoc(ModelVocabularies.ApiBinding, "MaxMessageBytes", "The max.message.bytes configuration option.")
)

override def fields: List[Field] = List(
Expand Down Expand Up @@ -303,53 +299,48 @@ object KafkaTopicConfiguration050Model extends KafkaTopicConfigurationModel {

val ConfluentKeySchemaValidation: Field = Field(
Bool,
ApiBinding + "confluent.key.schema.validation",
ApiBinding + "ConfluentKeySchemaValidation",
ModelDoc(
ModelVocabularies.ApiBinding,
"confluent.key.schema.validation",
"ConfluentKeySchemaValidation",
"It shows whether the schema validation for the message key is enabled. Vendor specific config."
)
)

val ConfluentKeySubjectNameStrategy: Field = Field(
Str,
ApiBinding + "confluent.key.subject.name.strategy",
ApiBinding + "ConfluentKeySubjectNameStrategy",
ModelDoc(
ModelVocabularies.ApiBinding,
"confluent.key.subject.name.strategy",
"ConfluentKeySubjectNameStrategy",
"The name of the schema lookup strategy for the message key. Vendor specific config."
)
)

val ConfluentValueSchemaValidation: Field = Field(
Bool,
ApiBinding + "confluent.value.schema.validation",
ApiBinding + "ConfluentValueSchemaValidation",
ModelDoc(
ModelVocabularies.ApiBinding,
"confluent.value.schema.validation",
"ConfluentValueSchemaValidation",
"It shows whether the schema validation for the message value is enabled. Vendor specific config."
)
)

val ConfluentValueSubjectNameStrategy: Field = Field(
Str,
ApiBinding + "confluent.value.subject.name.strategy",
ApiBinding + "ConfluentValueSubjectNameStrategy",
ModelDoc(
ModelVocabularies.ApiBinding,
"confluent.value.subject.name.strategy",
"ConfluentValueSubjectNameStrategy",
"The name of the schema lookup strategy for the message value. Vendor specific config."
)
)

override def fields: List[Field] = List(
CleanupPolicy,
RetentionMs,
RetentionBytes,
DeleteRetentionMs,
MaxMessageBytes,
ConfluentKeySchemaValidation,
ConfluentKeySubjectNameStrategy,
ConfluentValueSchemaValidation,
ConfluentValueSubjectNameStrategy
)
) ++ KafkaTopicConfigurationModel.fields
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,62 +25,62 @@ Level: Violation
Message: Kafka Topic Configuration 'cleanup.policy' field can only contain 'delete' and/or 'compact'.
Severity: Violation
Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml#/async-api/endpoint/other-channel/channel-bindings/bindings/kafka-channel-040
Property: http://a.ml/vocabularies/apiBinding#cleanup.policy
Property: http://a.ml/vocabularies/apiBinding#CleanupPolicy
Range: [(21,27)-(28,0)]
Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml

- Constraint: http://a.ml/vocabularies/amf/parser#KafkaChannelBinding040-replicas-KafkaTopicConfigurationValidations
Message: Kafka topic configuration 'delete.retention.ms' field must be a positive number
Severity: Violation
Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml#/async-api/endpoint/other-channel/channel-bindings/bindings/kafka-channel-040
Property: http://a.ml/vocabularies/apiBinding#delete.retention.ms
Property: http://a.ml/vocabularies/apiBinding#DeleteRetentionMs
Range: [(21,27)-(28,0)]
Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml

- Constraint: http://a.ml/vocabularies/amf/parser#KafkaChannelBinding040-replicas-KafkaTopicConfigurationValidations
Message: Kafka topic configuration 'max.message.bytes' field must be a positive number
Severity: Violation
Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml#/async-api/endpoint/other-channel/channel-bindings/bindings/kafka-channel-040
Property: http://a.ml/vocabularies/apiBinding#max.message.bytes
Property: http://a.ml/vocabularies/apiBinding#MaxMessageBytes
Range: [(21,27)-(28,0)]
Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml

- Constraint: http://a.ml/vocabularies/amf/parser#KafkaChannelBinding040-replicas-KafkaTopicConfigurationValidations
Message: Kafka Topic Configuration 'retention.ms' field valid values are [-1,...]
Severity: Violation
Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml#/async-api/endpoint/other-channel/channel-bindings/bindings/kafka-channel-040
Property: http://a.ml/vocabularies/apiBinding#retention.ms
Property: http://a.ml/vocabularies/apiBinding#RetentionMs
Range: [(21,27)-(28,0)]
Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml

- Constraint: http://a.ml/vocabularies/amf/parser#KafkaChannelBinding050-replicas-KafkaTopicConfigurationValidations
Message: Kafka Topic Configuration 'cleanup.policy' field can only contain 'delete' and/or 'compact'.
Severity: Violation
Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml#/async-api/endpoint/the-other-channel/channel-bindings/bindings/kafka-channel-050
Property: http://a.ml/vocabularies/apiBinding#cleanup.policy
Property: http://a.ml/vocabularies/apiBinding#CleanupPolicy
Range: [(35,27)-(40,58)]
Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml

- Constraint: http://a.ml/vocabularies/amf/parser#KafkaChannelBinding050-replicas-KafkaTopicConfigurationValidations
Message: Kafka topic configuration 'delete.retention.ms' field must be a positive number
Severity: Violation
Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml#/async-api/endpoint/the-other-channel/channel-bindings/bindings/kafka-channel-050
Property: http://a.ml/vocabularies/apiBinding#delete.retention.ms
Property: http://a.ml/vocabularies/apiBinding#DeleteRetentionMs
Range: [(35,27)-(40,58)]
Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml

- Constraint: http://a.ml/vocabularies/amf/parser#KafkaChannelBinding050-replicas-KafkaTopicConfigurationValidations
Message: Kafka topic configuration 'max.message.bytes' field must be a positive number
Severity: Violation
Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml#/async-api/endpoint/the-other-channel/channel-bindings/bindings/kafka-channel-050
Property: http://a.ml/vocabularies/apiBinding#max.message.bytes
Property: http://a.ml/vocabularies/apiBinding#MaxMessageBytes
Range: [(35,27)-(40,58)]
Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml

- Constraint: http://a.ml/vocabularies/amf/parser#KafkaChannelBinding050-replicas-KafkaTopicConfigurationValidations
Message: Kafka Topic Configuration 'retention.ms' field valid values are [-1,...]
Severity: Violation
Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml#/async-api/endpoint/the-other-channel/channel-bindings/bindings/kafka-channel-050
Property: http://a.ml/vocabularies/apiBinding#retention.ms
Property: http://a.ml/vocabularies/apiBinding#RetentionMs
Range: [(35,27)-(40,58)]
Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/kafka-channel-binding-validations.yaml
Loading