config-loader: remove deprecated $secret support

packages/config-loader/src/lib/reader.test.ts

@@ -123,50 +123,9 @@ describe('readConfigFile', () => {
     expect(readSecret).not.toHaveBeenCalled();
   });
 
-  it('should read deprecated secrets', async () => {
-    const readFile = memoryFiles({
-      './app-config.yaml': 'app: { $secret: { file: "./my-secret" } }',
-    });
-    const readSecret = jest.fn().mockResolvedValue('secret');
-
-    const config = readConfigFile('./app-config.yaml', {
-      ...mockContext,
-      readFile,
-      readSecret: readSecret as ReadSecretFunc,
-    });
-
-    await expect(config).resolves.toEqual({
-      data: {
-        app: 'secret',
-      },
-      context: 'app-config.yaml',
-    });
-    expect(readSecret).toHaveBeenCalledWith('.app', {
-      file: './my-secret',
-    });
-  });
-
-  it('should require deprecated secrets to be objects', async () => {
-    const readFile = memoryFiles({
-      './app-config.yaml': 'app: { $secret: ["wrong-type"] }',
-    });
-    const readSecret = jest.fn().mockResolvedValue('secret');
-
-    const config = readConfigFile('./app-config.yaml', {
-      ...mockContext,
-      readFile,
-      readSecret: readSecret as ReadSecretFunc,
-    });
-
-    expect(readSecret).not.toHaveBeenCalled();
-    await expect(config).rejects.toThrow(
-      'Expected object at secret .app.$secret',
-    );
-  });
-
   it('should forward secret reading errors', async () => {
     const readFile = memoryFiles({
-      './app-config.yaml': 'app: { $secret: {} }',
+      './app-config.yaml': 'app: { $file: {} }',
     });
     const readSecret = jest.fn().mockRejectedValue(new Error('NOPE'));
 

packages/config-loader/src/lib/reader.ts

@@ -54,22 +54,6 @@ export async function readConfigFile(
       return arr;
     }
 
-    // TODO(Rugvip): This form of declaring secrets is deprecated, warn and remove in the future
-    if ('$secret' in obj) {
-      console.warn(
-        `Deprecated secret declaration at '${path}' in '${context}', use $env, $file, etc. instead`,
-      );
-      if (!isObject(obj.$secret)) {
-        throw TypeError(`Expected object at secret ${path}.$secret`);
-      }
-
-      try {
-        return await ctx.readSecret(path, obj.$secret);
-      } catch (error) {
-        throw new Error(`Invalid secret at ${path}: ${error.message}`);
-      }
-    }
-
     // Check if there's any key that starts with a '$', in that case we treat
     // this entire object as a secret.
     const [secretKey] = Object.keys(obj).filter(key => key.startsWith('$'));