From ac1680c403242d6fdc0a778b5bd73029efcabd9d Mon Sep 17 00:00:00 2001
From: Adam Dyess <adam.dyess@canonical.com>
Date: Mon, 5 Feb 2024 17:46:28 -0600
Subject: [PATCH] read metadata from charmcraft.yaml

---
 dist/channel/index.js                 | 8 +++++++-
 dist/check-libraries/index.js         | 8 +++++++-
 dist/release-charm/index.js           | 8 +++++++-
 dist/release-libraries/index.js       | 8 +++++++-
 dist/upload-bundle/index.js           | 8 +++++++-
 dist/upload-charm/index.js            | 8 +++++++-
 src/services/charmcraft/charmcraft.ts | 9 ++++++++-
 7 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/dist/channel/index.js b/dist/channel/index.js
index 59c93a6e..a102d904 100644
--- a/dist/channel/index.js
+++ b/dist/channel/index.js
@@ -42620,8 +42620,14 @@ class Charmcraft {
             };
         });
     }
+    _read() {
+        if (fs.existsSync('metadata.yaml')) {
+            return fs.readFileSync('metadata.yaml');
+        }
+        return fs.readFileSync('charmcraft.yaml');
+    }
     metadata() {
-        const buffer = fs.readFileSync('metadata.yaml');
+        const buffer = this._read();
         const metadata = yaml.load(buffer.toString());
         const resources = Object.entries(metadata.resources || {});
         const files = resources
diff --git a/dist/check-libraries/index.js b/dist/check-libraries/index.js
index 310e6fa9..17557eaf 100644
--- a/dist/check-libraries/index.js
+++ b/dist/check-libraries/index.js
@@ -42815,8 +42815,14 @@ class Charmcraft {
             };
         });
     }
+    _read() {
+        if (fs.existsSync('metadata.yaml')) {
+            return fs.readFileSync('metadata.yaml');
+        }
+        return fs.readFileSync('charmcraft.yaml');
+    }
     metadata() {
-        const buffer = fs.readFileSync('metadata.yaml');
+        const buffer = this._read();
         const metadata = yaml.load(buffer.toString());
         const resources = Object.entries(metadata.resources || {});
         const files = resources
diff --git a/dist/release-charm/index.js b/dist/release-charm/index.js
index adf00d5f..d4454ed6 100644
--- a/dist/release-charm/index.js
+++ b/dist/release-charm/index.js
@@ -42711,8 +42711,14 @@ class Charmcraft {
             };
         });
     }
+    _read() {
+        if (fs.existsSync('metadata.yaml')) {
+            return fs.readFileSync('metadata.yaml');
+        }
+        return fs.readFileSync('charmcraft.yaml');
+    }
     metadata() {
-        const buffer = fs.readFileSync('metadata.yaml');
+        const buffer = this._read();
         const metadata = yaml.load(buffer.toString());
         const resources = Object.entries(metadata.resources || {});
         const files = resources
diff --git a/dist/release-libraries/index.js b/dist/release-libraries/index.js
index c44112af..80da938d 100644
--- a/dist/release-libraries/index.js
+++ b/dist/release-libraries/index.js
@@ -42842,8 +42842,14 @@ class Charmcraft {
             };
         });
     }
+    _read() {
+        if (fs.existsSync('metadata.yaml')) {
+            return fs.readFileSync('metadata.yaml');
+        }
+        return fs.readFileSync('charmcraft.yaml');
+    }
     metadata() {
-        const buffer = fs.readFileSync('metadata.yaml');
+        const buffer = this._read();
         const metadata = yaml.load(buffer.toString());
         const resources = Object.entries(metadata.resources || {});
         const files = resources
diff --git a/dist/upload-bundle/index.js b/dist/upload-bundle/index.js
index 47a367c1..4af8d331 100644
--- a/dist/upload-bundle/index.js
+++ b/dist/upload-bundle/index.js
@@ -42690,8 +42690,14 @@ class Charmcraft {
             };
         });
     }
+    _read() {
+        if (fs.existsSync('metadata.yaml')) {
+            return fs.readFileSync('metadata.yaml');
+        }
+        return fs.readFileSync('charmcraft.yaml');
+    }
     metadata() {
-        const buffer = fs.readFileSync('metadata.yaml');
+        const buffer = this._read();
         const metadata = yaml.load(buffer.toString());
         const resources = Object.entries(metadata.resources || {});
         const files = resources
diff --git a/dist/upload-charm/index.js b/dist/upload-charm/index.js
index 8de3faa2..bc72b156 100644
--- a/dist/upload-charm/index.js
+++ b/dist/upload-charm/index.js
@@ -42721,8 +42721,14 @@ class Charmcraft {
             };
         });
     }
+    _read() {
+        if (fs.existsSync('metadata.yaml')) {
+            return fs.readFileSync('metadata.yaml');
+        }
+        return fs.readFileSync('charmcraft.yaml');
+    }
     metadata() {
-        const buffer = fs.readFileSync('metadata.yaml');
+        const buffer = this._read();
         const metadata = yaml.load(buffer.toString());
         const resources = Object.entries(metadata.resources || {});
         const files = resources
diff --git a/src/services/charmcraft/charmcraft.ts b/src/services/charmcraft/charmcraft.ts
index 29ad5da3..af16777b 100644
--- a/src/services/charmcraft/charmcraft.ts
+++ b/src/services/charmcraft/charmcraft.ts
@@ -164,8 +164,15 @@ class Charmcraft {
     };
   }
 
+  _read() {
+    if (fs.existsSync('metadata.yaml')) {
+      return fs.readFileSync('metadata.yaml');
+    }
+    return fs.readFileSync('charmcraft.yaml');
+  }
+
   metadata() {
-    const buffer = fs.readFileSync('metadata.yaml');
+    const buffer = this._read();
     const metadata = yaml.load(buffer.toString()) as Metadata;
     const resources = Object.entries(metadata.resources || {});