Skip to content

Commit 82e561c

Browse files
algolia-botmillotp
andcommitted
feat(specs): only use shortname in the source input [skip-bc] (generated)
algolia/api-clients-automation#4287 Co-authored-by: algolia-bot <accounts+algolia-api-client-bot@algolia.com> Co-authored-by: Pierre Millot <pierre.millot@algolia.com>
1 parent 89e7f10 commit 82e561c

File tree

7 files changed

+4
-135
lines changed

7 files changed

+4
-135
lines changed

src/main/scala/algoliasearch/ingestion/DockerImageType.scala

-53
This file was deleted.

src/main/scala/algoliasearch/ingestion/DockerRegistry.scala

-53
This file was deleted.

src/main/scala/algoliasearch/ingestion/JsonSupport.scala

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ object JsonSupport {
3030
new BigQueryDataTypeSerializer() :+
3131
new DestinationSortKeysSerializer() :+
3232
new DestinationTypeSerializer() :+
33-
new DockerImageTypeSerializer() :+
34-
new DockerRegistrySerializer() :+
3533
new DockerStreamsSyncModeSerializer() :+
3634
new EntityTypeSerializer() :+
3735
new EventSortKeysSerializer() :+

src/main/scala/algoliasearch/ingestion/SourceDocker.scala

+1-9
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,14 @@
1919
*/
2020
package algoliasearch.ingestion
2121

22-
import algoliasearch.ingestion.DockerImageType._
23-
import algoliasearch.ingestion.DockerRegistry._
24-
2522
/** SourceDocker
2623
*
2724
* @param image
28-
* Docker image name.
29-
* @param version
30-
* Docker image version.
25+
* Shortname of the image, as returned by the referential.
3126
* @param configuration
3227
* Configuration of the spec.
3328
*/
3429
case class SourceDocker(
35-
imageType: DockerImageType,
36-
registry: DockerRegistry,
3730
image: String,
38-
version: Option[String] = scala.None,
3931
configuration: Any
4032
) extends SourceInputTrait

src/main/scala/algoliasearch/ingestion/SourceInput.scala

+3-8
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
package algoliasearch.ingestion
2121

2222
import algoliasearch.ingestion.BigQueryDataType._
23-
import algoliasearch.ingestion.DockerImageType._
24-
import algoliasearch.ingestion.DockerRegistry._
2523
import algoliasearch.ingestion.MappingTypeCSV._
2624
import algoliasearch.ingestion.MethodType._
2725

@@ -40,15 +38,12 @@ object SourceInputSerializer extends Serializer[SourceInput] {
4038

4139
case (TypeInfo(clazz, _), json) if clazz == classOf[SourceInput] =>
4240
json match {
43-
case value: JObject
44-
if value.obj.exists(_._1 == "registry") && value.obj.exists(_._1 == "image") && value.obj.exists(
45-
_._1 == "imageType"
46-
) && value.obj.exists(_._1 == "configuration") =>
47-
Extraction.extract[SourceDocker](value)
4841
case value: JObject
4942
if value.obj.exists(_._1 == "projectID") && value.obj
5043
.exists(_._1 == "datasetID") && value.obj.exists(_._1 == "tablePrefix") =>
5144
Extraction.extract[SourceGA4BigQueryExport](value)
45+
case value: JObject if value.obj.exists(_._1 == "image") && value.obj.exists(_._1 == "configuration") =>
46+
Extraction.extract[SourceDocker](value)
5247
case value: JObject if value.obj.exists(_._1 == "projectKey") => Extraction.extract[SourceCommercetools](value)
5348
case value: JObject if value.obj.exists(_._1 == "storeHash") => Extraction.extract[SourceBigCommerce](value)
5449
case value: JObject if value.obj.exists(_._1 == "projectID") => Extraction.extract[SourceBigQuery](value)
@@ -61,8 +56,8 @@ object SourceInputSerializer extends Serializer[SourceInput] {
6156

6257
override def serialize(implicit format: Formats): PartialFunction[Any, JValue] = { case value: SourceInput =>
6358
value match {
64-
case value: SourceDocker => Extraction.decompose(value)(format - this)
6559
case value: SourceGA4BigQueryExport => Extraction.decompose(value)(format - this)
60+
case value: SourceDocker => Extraction.decompose(value)(format - this)
6661
case value: SourceCommercetools => Extraction.decompose(value)(format - this)
6762
case value: SourceBigCommerce => Extraction.decompose(value)(format - this)
6863
case value: SourceBigQuery => Extraction.decompose(value)(format - this)

src/main/scala/algoliasearch/ingestion/SourceUpdateDocker.scala

-9
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,11 @@
1919
*/
2020
package algoliasearch.ingestion
2121

22-
import algoliasearch.ingestion.DockerRegistry._
23-
2422
/** SourceUpdateDocker
2523
*
26-
* @param image
27-
* Docker image name.
28-
* @param version
29-
* Docker image version.
3024
* @param configuration
3125
* Configuration of the spec.
3226
*/
3327
case class SourceUpdateDocker(
34-
registry: Option[DockerRegistry] = scala.None,
35-
image: Option[String] = scala.None,
36-
version: Option[String] = scala.None,
3728
configuration: Any
3829
) extends SourceUpdateInputTrait

src/main/scala/algoliasearch/ingestion/SourceUpdateInput.scala

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package algoliasearch.ingestion
2121

2222
import algoliasearch.ingestion.BigQueryDataType._
23-
import algoliasearch.ingestion.DockerRegistry._
2423
import algoliasearch.ingestion.MappingTypeCSV._
2524
import algoliasearch.ingestion.MethodType._
2625

0 commit comments

Comments
 (0)