Merge pull request #78 from kubukoz/service-name-aws

kubukoz · Aug 12, 2022 · fc3b99a · fc3b99a
2 parents 1bbf57c + a77a7fc
commit fc3b99a
Show file tree

Hide file tree

Showing 6 changed files with 8,981 additions and 4 deletions.
diff --git a/core/src/main/scala/playground/CompletionProvider.scala b/core/src/main/scala/playground/CompletionProvider.scala
@@ -28,7 +28,7 @@ object CompletionProvider {
       dsi
         .allServices
         .map { service =>
-          QualifiedIdentifier.fromShapeId(service.service.id) -> service
+          QualifiedIdentifier.forService(service.service) -> service
         }
         .toMap
 

diff --git a/core/src/main/scala/playground/ServiceNameExtractor.scala b/core/src/main/scala/playground/ServiceNameExtractor.scala
@@ -0,0 +1,15 @@
+package playground
+
+import aws.api
+import playground.smithyql.QualifiedIdentifier
+import smithy4s.Service
+
+object ServiceNameExtractor {
+
+  def fromService[Alg[_[_, _, _, _, _]], Op[_, _, _, _, _]](
+    service: Service[Alg, Op]
+  ): QualifiedIdentifier = QualifiedIdentifier.fromShapeId(
+    service.id.copy(name = service.hints.get(api.Service).map(_.sdkId).getOrElse(service.id.name))
+  )
+
+}
diff --git a/core/src/main/scala/playground/run.scala b/core/src/main/scala/playground/run.scala
@@ -85,7 +85,7 @@ object Compiler {
         .map { svc =>
           // todo: deprecated services (here / in completions)
           QualifiedIdentifier
-            .fromShapeId(svc.service.id) -> Compiler.fromService[svc.Alg, svc.Op](svc.service)
+            .forService(svc.service) -> Compiler.fromService[svc.Alg, svc.Op](svc.service)
         }
         .toMap
 
@@ -127,7 +127,7 @@ private class ServiceCompiler[Alg[_[_, _, _, _, _]], Op[_, _, _, _, _]](
             type E = Err
             type O = Out
             val input: I = compiled
-            val serviceId: QualifiedIdentifier = QualifiedIdentifier.fromShapeId(service.id)
+            val serviceId: QualifiedIdentifier = QualifiedIdentifier.forService(service)
             val endpoint: Endpoint[Op, I, E, O, _, _] = e
             val writeOutput: NodeEncoder[Out] = outputEncoder
             val writeError: Option[NodeEncoder[Err]] = errorEncoder
@@ -262,7 +262,7 @@ object Runner {
       dsi
         .allServices
         .map { svc =>
-          QualifiedIdentifier.fromShapeId(svc.service.id) ->
+          QualifiedIdentifier.forService(svc.service) ->
             Runner.forService[svc.Alg, svc.Op, F](
               svc.service,
               client,

diff --git a/core/src/main/scala/playground/smithyql/AST.scala b/core/src/main/scala/playground/smithyql/AST.scala
@@ -9,6 +9,8 @@ import smithy4s.ShapeId
 import cats.Show
 import cats.kernel.Eq
 import cats.Id
+import playground.ServiceNameExtractor
+import smithy4s.Service
 
 sealed trait AST[F[_]] extends Product with Serializable {
   def mapK[G[_]: Functor](fk: F ~> G): AST[G]
@@ -54,7 +56,12 @@ object QualifiedIdentifier {
     shapeId.name,
   )
 
+  def forService[Alg[_[_, _, _, _, _]], Op[_, _, _, _, _]](
+    service: Service[Alg, Op]
+  ): QualifiedIdentifier = ServiceNameExtractor.fromService(service)
+
   implicit val show: Show[QualifiedIdentifier] = Show.fromToString
+  implicit val eq: Eq[QualifiedIdentifier] = Eq.fromUniversalEquals
 
 }
 

diff --git a/core/src/test/scala/playground/ServiceNameExtractorTests.scala b/core/src/test/scala/playground/ServiceNameExtractorTests.scala
@@ -0,0 +1,24 @@
+package playground
+
+import cats.data.NonEmptyList
+import com.amazonaws.lambda.LambdaGen
+import demo.smithy.DemoServiceGen
+import playground.smithyql.QualifiedIdentifier
+import weaver._
+
+object ServiceNameExtractorTests extends FunSuite {
+  test("extract name of service with an AWS hint") {
+    assert.eql(
+      ServiceNameExtractor.fromService(LambdaGen.service),
+      QualifiedIdentifier(NonEmptyList.of("com", "amazonaws", "lambda"), "Lambda"),
+    )
+  }
+
+  test("extract name of demo service") {
+
+    assert.eql(
+      ServiceNameExtractor.fromService(DemoServiceGen.service),
+      QualifiedIdentifier(NonEmptyList.of("demo", "smithy"), "DemoService"),
+    )
+  }
+}