fix duplicate @server definition (#542)

* fix duplicate `@server` definition * changelog
Azure · Mar 28, 2024 · fb5ed08 · fb5ed08
1 parent eb9e34f
commit fb5ed08
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/.changeset/strong-beers-fry.md b/.changeset/strong-beers-fry.md
@@ -0,0 +1,5 @@
+---
+"@azure-tools/cadl-ranch-specs": patch
+---
+
+fix duplicate `@server` definition
diff --git a/packages/cadl-ranch-specs/http/server/path/single/main.tsp b/packages/cadl-ranch-specs/http/server/path/single/main.tsp
@@ -4,7 +4,7 @@ import "@azure-tools/cadl-ranch-expect";
 using TypeSpec.Http;
 
 @doc("Illustrates server with a single path parameter @server")
-@scenarioService("/server/path/single")
+@service
 @server(
   "{endpoint}",
   "Testserver endpoint",
@@ -13,6 +13,7 @@ using TypeSpec.Http;
     endpoint: url,
   }
 )
+@route("/server/path/single")
 namespace Server.Path.Single;
 
 @scenario

diff --git a/packages/cadl-ranch-specs/http/server/versions/not-versioned/main.tsp b/packages/cadl-ranch-specs/http/server/versions/not-versioned/main.tsp
@@ -6,7 +6,7 @@ using TypeSpec.Http;
 /**
  * Illustrates not-versioned server.
  */
-@scenarioService("/server/versions/not-versioned")
+@service
 @server(
   "{endpoint}",
   "Testserver endpoint",
@@ -17,6 +17,7 @@ using TypeSpec.Http;
     endpoint: url,
   }
 )
+@route("/server/versions/not-versioned")
 namespace Server.Versions.NotVersioned;
 
 @scenario

diff --git a/packages/cadl-ranch-specs/http/server/versions/versioned/main.tsp b/packages/cadl-ranch-specs/http/server/versions/versioned/main.tsp
@@ -9,12 +9,8 @@ using TypeSpec.Versioning;
 /**
  * Illustrates versioned server.
  */
-@scenarioService(
-  "/server/versions/versioned",
-  {
-    versioned: Versions,
-  }
-)
+@service
+@versioned(Versions)
 @server(
   "{endpoint}",
   "Testserver endpoint",
@@ -25,6 +21,7 @@ using TypeSpec.Versioning;
     endpoint: url,
   }
 )
+@route("/server/versions/versioned")
 namespace Server.Versions.Versioned;
 
 /**