Bug 1505402 - servicesManifest -> apiManifest

Author: djmitche

README.md

@@ -33,7 +33,7 @@ root URL:
 * `exchangeReference(rootUrl, service, version)` -> `String`
 * `schema(rootUrl, service, schema)` -> `String`
 * `ui(rootUrl, path)` -> `String`
-* `servicesManifest(rootUrl)` -> `String`
+* `apiManifest(rootUrl)` -> `String`
 * `testRootUrl()` -> `String`
 * `withRootUrl(rootUrl)` -> `Class` instance for above methods
 
@@ -52,7 +52,7 @@ libUrls.schema(rootUrl, 'auth', 'v1/foo.yml'); // Note that schema names have ve
 libUrls.apiReference(rootUrl, 'auth', 'v1');
 libUrls.exchangeReference(rootUrl, 'auth', 'v1');
 libUrls.ui(rootUrl, 'foo/bar');
-libUrls.servicesManifest(rootUrl);
+libUrls.apiManifest(rootUrl);
 libUrls.docs(rootUrl, 'foo/bar');
 ```
 
@@ -67,7 +67,7 @@ urls.schema('auth', 'v1/foo.yml');
 urls.apiReference('auth', 'v1');
 urls.exchangeReference('auth', 'v1');
 urls.ui('foo/bar');
-urls.servicesManifest();
+urls.apiManifest();
 urls.docs('foo/bar');
 ```
 
@@ -104,7 +104,7 @@ func Docs(rootURL string, path string) string
 func ExchangeReference(rootURL string, service string, version string) string
 func Schema(rootURL string, service string, name string) string
 func UI(rootURL string, path string) string
-func ServicesManifest(rootURL string) string
+func APIManifest(rootURL string) string
 ```
 
 Install with:
@@ -132,7 +132,7 @@ taskcluster_urls.schema(root_url, 'auth', 'v1/foo.yml') # Note that schema names
 taskcluster_urls.api_reference(root_url, 'auth', 'v1')
 taskcluster_urls.exchange_reference(root_url, 'auth', 'v1')
 taskcluster_urls.ui(root_url, 'foo/bar')
-taskcluster_urls.servicesManifest(root_url)
+taskcluster_urls.apiManifest(root_url)
 taskcluster_urls.docs(root_url, 'foo/bar')
 
 And for testing,
@@ -186,7 +186,7 @@ import org.mozilla.taskcluster.urls.*;
     String authAPIRef       = urlProvider.apiReference("auth", "v1");
     String authExchangesRef = urlProvider.exchangeReference("auth", "v1");
     String uiFooBar         = urlProvider.ui("foo/bar");
-    String servicesManifest = urlProvider.servicesManifest();
+    String apiManifest      = urlProvider.apiManifest();
     String docsFooBar       = urlProvider.docs("foo/bar");
 
 ...

docs/urls-spec.md

@@ -25,7 +25,7 @@ Taskcluster uses URLs with the following pattern:
 | exchangeReference(rootUrl, service, version) | `<rootUrl>/references/<service>/<version>/exchanges.json` |
 | schema(rootUrl, service, schema) | `<rootUrl>/schemas/<service>/<schema>` |
 | ui(rootUrl, path) | `<rootUrl>/<path>` |
-| servicesManifest(rootUrl) | `<rootUrl>/references/manifest.json` |
+| apiManifest(rootUrl) | `<rootUrl>/references/manifest.json` |
 
 *NOTE*: you should *always* use this library to generate URLs, rather than
 hard-coding any of the above patterns.

src/index.js

@@ -54,7 +54,7 @@ class LegacyUrls {
   /**
    * Returns a URL for the service manifest of a taskcluster deployment.
    */
-  servicesManifest() {
+  apiManifest() {
     return 'https://references.taskcluster.net/manifest.json';
   }
 }
@@ -110,7 +110,7 @@ class Urls {
   /**
    * Returns a URL for the service manifest of a taskcluster deployment.
    */
-  servicesManifest() {
+  apiManifest() {
     return `${this.rootUrl}/references/manifest.json`;
   }
 }
@@ -195,8 +195,8 @@ module.exports = {
   /**
    * Returns a URL for the service manifest of a taskcluster deployment.
    */
-  servicesManifest(rootUrl) {
-    return withRootUrl(rootUrl).servicesManifest();
+  apiManifest(rootUrl) {
+    return withRootUrl(rootUrl).apiManifest();
   },
 
   /**

src/main/java/org/mozilla/taskcluster/urls/LegacyURLs.java

@@ -51,7 +51,7 @@ public String ui(String path) {
     /**
      * Returns a URL for the service manifest of a taskcluster deployment.
      */
-    public String servicesManifest() {
+    public String apiManifest() {
         return "https://references.taskcluster.net/manifest.json";
     }
 }

src/main/java/org/mozilla/taskcluster/urls/NewURLs.java

@@ -57,7 +57,7 @@ public String ui(String path) {
     /**
      * Returns a URL for the service manifest of a taskcluster deployment.
      */
-    public String servicesManifest() {
+    public String apiManifest() {
         return this.rootURL + "/references/manifest.json";
     }
 }

src/main/java/org/mozilla/taskcluster/urls/URLProvider.java

@@ -43,5 +43,5 @@ public interface URLProvider {
     /**
      * Returns a URL for the service manifest of a taskcluster deployment.
      */
-    public String servicesManifest();
+    public String apiManifest();
 }

src/test/java/org/mozilla/taskcluster/urls/URLsTest.java

@@ -62,8 +62,8 @@ public static String testFunc(String function, URLProvider urlProvider, String[]
             return urlProvider.schema(args[0], args[1]);
         case "ui":
             return urlProvider.ui(args[0]);
-        case "servicesManifest":
-            return urlProvider.servicesManifest();
+        case "apiManifest":
+            return urlProvider.apiManifest();
         default:
             throw new NoSuchMethodException("Unknown function type: " + function);
         }

taskcluster_urls/__init__.py

@@ -60,8 +60,8 @@ def ui(root_url, path):
     else:
         return '{}/{}'.format(root_url, path)
 
-def services_manifest(root_url):
-    """Returns a URL for the service manifest of a taskcluster deployment."""
+def api_manifest(root_url):
+    """Returns a URL for the API manifest of a taskcluster deployment."""
     root_url = root_url.rstrip('/')
     if root_url == OLD_ROOT_URL:
         return 'https://references.taskcluster.net/manifest.json'

tcurls.go

@@ -77,8 +77,8 @@ func UI(rootURL string, path string) string {
 	}
 }
 
-// ServicesManifest returns a URL for the service manifest of a taskcluster deployment
-func ServicesManifest(rootURL string) string {
+// APIManifest returns a URL for the service manifest of a taskcluster deployment
+func APIManifest(rootURL string) string {
 	switch r := strings.TrimRight(rootURL, "/"); r {
 	case oldRootURL:
 		return "https://references.taskcluster.net/manifest.json"

tcurls_test.go

@@ -34,8 +34,8 @@ func testFunc(t *testing.T, function string, expectedURL string, root string, ar
 		actualURL = Schema(root, args[0], args[1])
 	case "ui":
 		actualURL = UI(root, args[0])
-	case "servicesManifest":
-		actualURL = ServicesManifest(root)
+	case "apiManifest":
+		actualURL = APIManifest(root)
 	default:
 		t.Errorf("Unknown function type: %s", function)
 		return