chore: remove deprecated feature flags (#413)

* chore: remove deprecated feature flags

* fix: build issue

* fix: lgtm

Author: AaronZyLee

packages/amplify-codegen/package.json

@@ -24,9 +24,6 @@
     "@aws-amplify/graphql-docs-generator": "2.4.2",
     "@aws-amplify/graphql-types-generator": "2.8.6",
     "@graphql-codegen/core": "1.8.3",
-    "amplify-codegen-appsync-model-plugin": "^1.22.3",
-    "amplify-graphql-docs-generator": "^2.2.1",
-    "amplify-graphql-types-generator": "^2.7.0",
     "chalk": "^3.0.0",
     "fs-extra": "^8.1.0",
     "glob-all": "^3.1.0",

packages/amplify-codegen/src/commands/models.js

@@ -4,7 +4,7 @@ const { parse } = require('graphql');
 const glob = require('glob-all');
 const { FeatureFlags, pathManager } = require('amplify-cli-core');
 const gqlCodeGen = require('@graphql-codegen/core');
-const { getModelgenPackage } = require('../utils/getModelgenPackage');
+const appSyncDataStoreCodeGen = require('@aws-amplify/appsync-modelgen-plugin');
 const { validateDartSDK } = require('../utils/validateDartSDK');
 const { validateAmplifyFlutterCapableZeroThreeFeatures } = require('../utils/validateAmplifyFlutterCapableZeroThreeFeatures');
 const { validateAmplifyFlutterCoreLibraryDependency } = require('../utils/validateAmplifyFlutterCoreLibraryDependency');
@@ -79,9 +79,6 @@ async function generateModels(context) {
   const outputPath = path.join(projectRoot, getModelOutputPath(context));
   const schema = parse(schemaContent);
   const projectConfig = context.amplify.getProjectConfig();
-  //get modelgen package
-  const modelgenPackageMigrationflag = 'codegen.useAppSyncModelgenPlugin';
-  const appSyncDataStoreCodeGen = getModelgenPackage(FeatureFlags.getBoolean(modelgenPackageMigrationflag));
 
   const generateIndexRules = readFeatureFlag('codegen.generateIndexRules');
   const emitAuthProvider = readFeatureFlag('codegen.emitAuthProvider');

packages/amplify-codegen/src/commands/statements.js

@@ -5,9 +5,7 @@ const Ora = require('ora');
 const loadConfig = require('../codegen-config');
 const constants = require('../constants');
 const { ensureIntrospectionSchema, getFrontEndHandler, getAppSyncAPIDetails } = require('../utils');
-const { FeatureFlags } = require('amplify-cli-core');
-const { getDocsgenPackage } = require('../utils/getDocsgenPackage');
-const docsgenPackageMigrationflag = 'codegen.useDocsGeneratorPlugin';
+const { generate } = require('@aws-amplify/graphql-docs-generator')
 
 async function generateStatements(context, forceDownloadSchema, maxDepth, withoutInit = false, decoupleFrontend = '') {
   try {
@@ -36,8 +34,6 @@ async function generateStatements(context, forceDownloadSchema, maxDepth, withou
     return;
   }
 
-  const { generate } = getDocsgenPackage(FeatureFlags.getBoolean(docsgenPackageMigrationflag));
-
   for (const cfg of projects) {
     const includeFiles = path.join(projectPath, cfg.includes[0]);
     const opsGenDirectory = cfg.amplifyExtension.docsFilePath
@@ -63,7 +59,6 @@ async function generateStatements(context, forceDownloadSchema, maxDepth, withou
         separateFiles: true,
         language,
         maxDepth: maxDepth || cfg.amplifyExtension.maxDepth,
-        retainCaseStyle: FeatureFlags.getBoolean('codegen.retainCaseStyle')
       });
       opsGenSpinner.succeed(constants.INFO_MESSAGE_OPS_GEN_SUCCESS + path.relative(path.resolve('.'), opsGenDirectory));
     } finally {

packages/amplify-codegen/src/commands/types.js

@@ -5,9 +5,7 @@ const Ora = require('ora');
 const constants = require('../constants');
 const loadConfig = require('../codegen-config');
 const { ensureIntrospectionSchema, getFrontEndHandler, getAppSyncAPIDetails } = require('../utils');
-const { FeatureFlags } = require('amplify-cli-core');
-const { getTypesgenPackage } = require('../utils/getTypesgenPackage');
-const typesgenPackageMigrationflag = 'codegen.useTypesGeneratorPlugin';
+const { generate } = require('@aws-amplify/graphql-types-generator');
 
 async function generateTypes(context, forceDownloadSchema, withoutInit = false, decoupleFrontend = '') {
   let frontend = decoupleFrontend;
@@ -38,8 +36,6 @@ async function generateTypes(context, forceDownloadSchema, withoutInit = false,
       ({ projectPath } = context.amplify.getEnvInfo());
     }
 
-    const { generate } = getTypesgenPackage(FeatureFlags.getBoolean(typesgenPackageMigrationflag));
-
     try {
       projects.forEach(async cfg => {
         const { generatedFileName } = cfg.amplifyExtension || {};

packages/amplify-codegen/src/utils/getDocsgenPackage.js

@@ -15,9 +15,6 @@ const isCodegenConfigured = require('./isCodegenConfigured');
 const getSDLSchemaLocation = require('./getSDLSchemaLocation');
 const switchToSDLSchema = require('./switchToSDLSchema');
 const ensureIntrospectionSchema = require('./ensureIntrospectionSchema');
-const getModelgenPackage = require('./getModelgenPackage');
-const getDocsgenPackage = require('./getDocsgenPackage');
-const getTypesgenPackage = require('./getTypesgenPackage');
 
 module.exports = {
   getAppSyncAPIDetails,
@@ -37,7 +34,4 @@ module.exports = {
   getSDLSchemaLocation,
   switchToSDLSchema,
   ensureIntrospectionSchema,
-  getModelgenPackage,
-  getDocsgenPackage,
-  getTypesgenPackage
 };

packages/amplify-codegen/src/utils/getModelgenPackage.js

@@ -23,21 +23,6 @@ jest.mock('../../src/commands/types');
 jest.mock('../../src/commands/statements');
 jest.mock('../../src/codegen-config');
 jest.mock('../../src/utils');
-// Mock the Feature flags for statements and types generation to use migrated packages
-jest.mock('amplify-cli-core', () => {
-  return {
-    FeatureFlags: {
-      getBoolean: jest.fn().mockImplementation((name, defaultValue) => {
-        if (name === 'codegen.useDocsGeneratorPlugin') {
-          return true;
-        }
-        if (name === 'codegen.useTypesGeneratorPlugin') {
-          return true;
-        }
-      })
-    },
-  };
-});
 
 const MOCK_INCLUDE_PATTERN = 'MOCK_INCLUDE';
 const MOCK_EXCLUDE_PATTERN = 'MOCK_EXCLUDE';

packages/amplify-codegen/src/utils/getTypesgenPackage.js

@@ -7,22 +7,6 @@ jest.mock('../../src/commands/add');
 jest.mock('../../src/codegen-config');
 jest.mock('../../src/walkthrough/configure');
 
-// Mock the Feature flags for statements and types generation to use migrated packages
-jest.mock('amplify-cli-core', () => {
-  return {
-    FeatureFlags: {
-      getBoolean: jest.fn().mockImplementation((name, defaultValue) => {
-        if (name === 'codegen.useDocsGeneratorPlugin') {
-          return true;
-        }
-        if (name === 'codegen.useTypesGeneratorPlugin') {
-          return true;
-        }
-      })
-    },
-  };
-});
-
 const MOCK_CONFIG_METHOD = {
   getProjects: jest.fn(),
   addProject: jest.fn(),