removal of creation of user owned context (#202)

Oleg Sucharevich · web-flow · commit f9d850decde2 · 2018-07-08T10:23:01.000+03:00
diff --git a/lib/interface/cli/commands/context/create/createConfig.cmd.js b/lib/interface/cli/commands/context/create/createConfig.cmd.js
@@ -21,11 +21,6 @@ const command = new Command({
             .positional('name', {
                 describe: 'Name of context',
             })
-            .option('owner', {
-                describe: 'Owner of the context',
-                choices: ['user', 'account'],
-                default: 'account',
-            })
             .option('variable', {
                 describe: 'Variables list',
                 default: [],
@@ -39,7 +34,6 @@ const command = new Command({
         const data = {
             apiVersion: 'v1',
             kind: 'context',
-            owner: argv.owner,
             metadata: {
                 name: argv.name,
             },
diff --git a/lib/interface/cli/commands/context/create/createSecret.cmd.js b/lib/interface/cli/commands/context/create/createSecret.cmd.js
@@ -21,11 +21,6 @@ const command = new Command({
             .positional('name', {
                 describe: 'Name of context',
             })
-            .option('owner', {
-                describe: 'Owner of the context',
-                choices: ['user', 'account'],
-                default: 'account',
-            })
             .option('variable', {
                 describe: 'Variables list',
                 default: [],
@@ -39,7 +34,6 @@ const command = new Command({
         const data = {
             apiVersion: 'v1',
             kind: 'context',
-            owner: argv.owner,
             metadata: {
                 name: argv.name,
             },
diff --git a/lib/interface/cli/commands/context/create/createSecretYaml.cmd.js b/lib/interface/cli/commands/context/create/createSecretYaml.cmd.js
@@ -21,11 +21,6 @@ const command = new Command({
             .positional('name', {
                 describe: 'Name of context',
             })
-            .option('owner', {
-                describe: 'Owner of the context',
-                choices: ['user', 'account'],
-                default: 'account',
-            })
             .option('variable', {
                 describe: 'Variables list',
                 default: [],
@@ -38,7 +33,6 @@ const command = new Command({
         const data = {
             apiVersion: 'v1',
             kind: 'context',
-            owner: argv.owner,
             metadata: {
                 name: argv.name,
             },
diff --git a/lib/interface/cli/commands/context/create/createYaml.cmd.js b/lib/interface/cli/commands/context/create/createYaml.cmd.js
@@ -21,11 +21,6 @@ const command = new Command({
             .positional('name', {
                 describe: 'Name of context',
             })
-            .option('owner', {
-                describe: 'Owner of the context',
-                choices: ['user', 'account'],
-                default: 'account',
-            })
             .option('variable', {
                 describe: 'Variables list',
                 default: [],
@@ -38,7 +33,6 @@ const command = new Command({
         const data = {
             apiVersion: 'v1',
             kind: 'context',
-            owner: argv.owner,
             metadata: {
                 name: argv.name,
             },
diff --git a/lib/interface/cli/commands/context/create/git/types/bitbucket.cmd.js b/lib/interface/cli/commands/context/create/git/types/bitbucket.cmd.js
@@ -31,21 +31,13 @@ const command = new Command({
                 describe: 'username that has permissions to use app password',
                 alias: 'u',
                 required: true,
-            })
-            .option('owner', {
-                describe: 'Owner of the context, user owned contexts cannot be accessible by other users across the account',
-                choices: ['account', 'user'],
-                alias: 'o',
-                default: 'account',
-                required: true,
             });
         return yargs;
     },
     handler: async (argv) => {
         const data = {
             apiVersion: 'v1',
             kind: 'context',
-            owner: argv.owner || 'account',
             metadata: {
                 name: argv.name,
             },
diff --git a/lib/interface/cli/commands/context/create/git/types/github.cmd.js b/lib/interface/cli/commands/context/create/git/types/github.cmd.js
@@ -27,13 +27,6 @@ const command = new Command({
                 alias: 't',
                 required: true,
             })
-            .option('owner', {
-                describe: 'Owner of the context, user owned contexts cannot be accessible by other users across the account',
-                choices: ['account', 'user'],
-                alias: 'o',
-                default: 'account',
-                required: true,
-            })
             .option('use-ssl', {
                 describe: 'Connect to the git host using ssl',
                 choices: [true, false],
@@ -54,7 +47,6 @@ const command = new Command({
         const data = {
             apiVersion: 'v1',
             kind: 'context',
-            owner: argv.owner || 'account',
             metadata: {
                 name: argv.name,
             },
diff --git a/lib/interface/cli/commands/context/create/git/types/gitlab.cmd.js b/lib/interface/cli/commands/context/create/git/types/gitlab.cmd.js
@@ -27,13 +27,6 @@ const command = new Command({
                 alias: 't',
                 required: true,
             })
-            .option('owner', {
-                describe: 'Owner of the context, user owned contexts cannot be accessible by other users across the account',
-                choices: ['account', 'user'],
-                alias: 'o',
-                default: 'account',
-                required: true,
-            })
             .option('use-ssl', {
                 describe: 'Connect to the git host using ssl',
                 choices: [true, false],
@@ -54,7 +47,6 @@ const command = new Command({
         const data = {
             apiVersion: 'v1',
             kind: 'context',
-            owner: argv.owner || 'account',
             metadata: {
                 name: argv.name,
             },
diff --git a/lib/interface/cli/commands/context/create/git/types/stash.cmd.js b/lib/interface/cli/commands/context/create/git/types/stash.cmd.js
@@ -43,21 +43,13 @@ const command = new Command({
                 alias: 's',
                 default: true,
                 required: true,
-            })
-            .option('owner', {
-                describe: 'Owner of the context, user owned contexts cannot be accessible by other users across the account',
-                choices: ['account', 'user'],
-                alias: 'o',
-                default: 'account',
-                required: true,
             });
         return yargs;
     },
     handler: async (argv) => {
         const data = {
             apiVersion: 'v1',
             kind: 'context',
-            owner: argv.owner || 'account',
             metadata: {
                 name: argv.name,
             },
diff --git a/lib/interface/cli/commands/context/create/helm-repo/types/http.cmd.js b/lib/interface/cli/commands/context/create/helm-repo/types/http.cmd.js
@@ -31,7 +31,6 @@ const command = new Command({
         const data = {
             apiVersion: 'v1',
             kind: 'context',
-            owner: argv.owner,
             metadata: {
                 name: argv.name,
             },
diff --git a/lib/interface/cli/commands/context/create/helm-repo/types/s3.cmd.js b/lib/interface/cli/commands/context/create/helm-repo/types/s3.cmd.js
@@ -69,7 +69,6 @@ const command = new Command({
         const data = {
             apiVersion: 'v1',
             kind: 'context',
-            owner: argv.owner,
             metadata: {
                 name: argv.name,
             },
diff --git a/lib/interface/cli/commands/context/delete.cmd.js b/lib/interface/cli/commands/context/delete.cmd.js
@@ -23,13 +23,12 @@ const command = new Command({
     },
     handler: async (argv) => {
         const name = argv.filename ? _.get(argv.filename, 'metadata.name') : argv.name;
-        const owner = argv.filename ? _.get(argv.filename, 'owner') : argv.owner;
 
         if (!name) {
             throw new CFError('Name must be provided');
         }
 
-        await context.deleteContextByName(name, owner);
+        await context.deleteContextByName(name);
         console.log(`Context: ${name} deleted`);
     },
 });
diff --git a/lib/interface/cli/commands/context/get.cmd.js b/lib/interface/cli/commands/context/get.cmd.js
@@ -27,10 +27,6 @@ const command = new Command({
                 describe: 'Context type',
                 choices: ['config', 'secret', 'helm-repository', 'yaml', 'secret-yaml', 'git'],
             })
-            .option('owner', {
-                describe: 'Owner of the context',
-                choices: ['user', 'account'],
-            })
             .example('codefresh get context NAME', 'Get context NAME')
             .example('codefresh get contexts', 'Get all contexts')
             .example('codefresh get context --type secret', 'Get all secret contexts')
@@ -43,14 +39,11 @@ const command = new Command({
         if (argv.type) {
             data.type = argv.type;
         }
-        if (argv.owner) {
-            data.owner = argv.owner;
-        }
 
         let contexts = [];
         if (!_.isEmpty(names)) {
             for (const name of names) {
-                const currContext = await context.getContextByName(name, data.owner);
+                const currContext = await context.getContextByName(name);
                 contexts.push(currContext);
             }
         } else {
diff --git a/lib/interface/cli/commands/root/delete.cmd.js b/lib/interface/cli/commands/root/delete.cmd.js
@@ -35,8 +35,7 @@ const get = new Command({
 
         switch (entity) {
             case 'context':
-                const owner = data.owner;
-                await context.deleteContextByName(name, owner);
+                await context.deleteContextByName(name);
                 console.log(`Context: ${name} deleted`);
                 break;
             case 'pipeline':
diff --git a/lib/interface/functional/context/index.js b/lib/interface/functional/context/index.js
@@ -18,15 +18,14 @@ const TYPE_CHOICES = [
     'plain-yaml',
     'secret-yaml',
 ];
-const OWNER_CHOICES = ['account', 'user'];
 
-const getContext = async (name, owner = OWNER_CHOICES[0]) => {
+const getContext = async (name) => {
     if (!name) {
         throw new CFError('Name must be provided');
     }
 
     try {
-        return context.getContextByName(name, owner);
+        return context.getContextByName(name);
     } catch (err) {
         throw new CFError({
             cause: err,
@@ -35,14 +34,11 @@ const getContext = async (name, owner = OWNER_CHOICES[0]) => {
     }
 };
 
-const getAllContexts = async (type = null, owner = OWNER_CHOICES[0]) => {
+const getAllContexts = async (type = null) => {
     const data = {};
     if (type) {
         data.type = type;
     }
-    if (owner) {
-        data.owner = owner;
-    }
 
     try {
         return context.getContexts(data);
@@ -55,15 +51,14 @@ const getAllContexts = async (type = null, owner = OWNER_CHOICES[0]) => {
 };
 
 
-const createContext = async (name, type = null, owner = OWNER_CHOICES[0], envVarsDict = {}) => {
+const createContext = async (name, type = null, envVarsDict = {}) => {
     if (!name) {
         throw new CFError('Name must be provided');
     }
 
     const data = {
         apiVersion: 'v1',
         kind: 'context',
-        owner,
         metadata: {
             name,
         },
@@ -80,12 +75,12 @@ const createContext = async (name, type = null, owner = OWNER_CHOICES[0], envVar
     return context.createContext(data);
 };
 
-const deleteContext = async (name, owner = OWNER_CHOICES[0]) => {
+const deleteContext = async (name) => {
     if (!name) {
         throw new CFError('Name must be provided');
     }
 
-    return context.deleteContextByName(name, owner);
+    return context.deleteContextByName(name);
 };
 
 const applyContext = async (name, data) => {
@@ -123,5 +118,4 @@ module.exports = {
     replaceContext,
 
     TYPE_CHOICES,
-    OWNER_CHOICES,
 };
diff --git a/lib/logic/api/context.js b/lib/logic/api/context.js
@@ -7,7 +7,6 @@ const _extractFieldsForContextEntity = context => ({
     apiVersion: context.apiVersion,
     kind: context.kind,
     metadata: context.metadata,
-    owner: context.owner,
     type: context.spec.type,
     spec: context.spec,
 });
@@ -47,11 +46,10 @@ const applyByName = async (name, data) => {
     return sendHttpRequest(options);
 };
 
-const getContextByName = async (name, owner) => {
+const getContextByName = async (name) => {
     const options = {
         url: `/api/contexts/${name}`,
         method: 'GET',
-        qs: { owner },
     };
 
     const context = await sendHttpRequest(options);
@@ -63,7 +61,7 @@ const getContexts = async (info) => {
     const userOptions = {
         url: '/api/contexts',
         method: 'GET',
-        qs: _.pick(info, 'owner', 'type'),
+        qs: _.pick(info, 'type'),
     };
 
     const result = await sendHttpRequest(userOptions);
@@ -77,11 +75,10 @@ const getContexts = async (info) => {
     return contexts;
 };
 
-const deleteContextByName = async (name, owner) => {
+const deleteContextByName = async (name) => {
     const options = {
         url: `/api/contexts/${name}`,
         method: 'DELETE',
-        body: { owner },
     };
 
     return sendHttpRequest(options);
diff --git a/lib/logic/entities/Context.js b/lib/logic/entities/Context.js
@@ -9,7 +9,7 @@ class Context extends Entity {
         this.name = this.info.metadata.name;
         this.type = this.info.type;
         this.defaultColumns = ['name', 'type'];
-        this.wideColumns = this.defaultColumns.concat(['owner']);
+        this.wideColumns = this.defaultColumns || [];
     }
 
     // get the type of the context from spec.type
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.8.59",
+  "version": "0.8.60",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,
