Skip to content

Commit 9f820ab

Browse files
authored
Back down logging amount in ServiceLoader (#4147)
2 parents 9ffacd1 + 426a749 commit 9f820ab

File tree

1 file changed

+12
-19
lines changed

1 file changed

+12
-19
lines changed

buildSrc/src/main/kotlin/aws/sdk/ServiceLoader.kt

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,13 @@ fun Project.discoverServices(
104104
val models = awsModelsPath?.let { File(it) } ?: project.file("aws-models")
105105
val extrasDir = project.file("aws-models-extra")
106106
logger.info("Using model path: $models")
107-
val fileNames = fileTree(models).map { file -> file.name }
108-
logger.info("Discovered potential model files: $fileNames")
107+
val files = fileTree(models).sortedBy { file -> file.name }
108+
logger.info("Discovered potential model files: ${files.map { file -> file.name }}")
109109
val baseServices =
110-
fileTree(models)
111-
.sortedBy { file -> file.name }
110+
files
112111
.mapNotNull { file ->
113-
logger.info("Begin processing file: ${file.name}")
114112
val model = Model.assembler().addImport(file.absolutePath).assemble().result.get()
115113
val services: List<ServiceShape> = model.shapes(ServiceShape::class.java).sorted().toList()
116-
logger.info("Detected services: ${services.map { it.id.toString() }}")
117114
if (services.size > 1) {
118115
throw Exception("There must be exactly one service in each aws model file")
119116
}
@@ -122,7 +119,6 @@ fun Project.discoverServices(
122119
null
123120
} else {
124121
val service = services[0]
125-
logger.info("Begin processing service: ${service.id}")
126122
val title = service.expectTrait(TitleTrait::class.java).value
127123
val sdkId =
128124
service.expectTrait(ServiceTrait::class.java).sdkId
@@ -140,18 +136,15 @@ fun Project.discoverServices(
140136
listOf()
141137
}
142138

143-
val processedService =
144-
AwsService(
145-
service = service.id.toString(),
146-
module = sdkId,
147-
moduleDescription = "AWS SDK for $title",
148-
modelFile = file,
149-
// Order is important for the versions.toml model hash calculation
150-
extraFiles = extras.sorted(),
151-
humanName = title,
152-
)
153-
logger.info("Successfully processed service: $processedService")
154-
processedService
139+
AwsService(
140+
service = service.id.toString(),
141+
module = sdkId,
142+
moduleDescription = "AWS SDK for $title",
143+
modelFile = file,
144+
// Order is important for the versions.toml model hash calculation
145+
extraFiles = extras.sorted(),
146+
humanName = title,
147+
)
155148
}
156149
}
157150
val baseModules = baseServices.map { it.module }.toSet()

0 commit comments

Comments
 (0)