Merge pull request #15 from cloudgraphdev/feature/CG-490

tyler-dunkel · web-flow · commit 983f6a10f1d8 · 2022-01-17T14:55:09.000-06:00
Feature/cg 490 networkPolicy
diff --git a/README.md b/README.md
@@ -41,6 +41,7 @@ Authenticate the CloudGraph k8s Provider any of the following ways:
 | ingress                      | namespace          |
 | job                          | namespace          |
 | namespace                    | ALL SERVICES       |
+| networkPolicy                | namespace          |
 | node                         | namespace          |
 | persistentVolume             | namespace          |
 | persistentVolumeClaim        | namespace          |
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloudgraph/cg-provider-k8s",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Kubernetes provider for the CloudGraph CLI",
   "publishConfig": {
     "access": "public"
diff --git a/src/enums/pluralization.ts b/src/enums/pluralization.ts
@@ -0,0 +1,17 @@
+export default {
+  cronJob: 'cronJobs',
+  deployment: 'deployments',
+  ingress: 'ingresses',
+  job: 'jobs',
+  namespace: 'namespaces',
+  networkPolicy: 'networkPolicies',
+  node: 'nodes',
+  persistentVolume: 'persistentVolumes',
+  persistentVolumeClaim: 'persistentVolumeClaims',
+  pod: 'pods',
+  role: 'roles',
+  secret: 'secrets',
+  service: 'services',
+  serviceAccount: 'serviceAccounts',
+  storageClass: 'storageClasses'
+}
diff --git a/src/enums/schemasMap.ts b/src/enums/schemasMap.ts
@@ -3,6 +3,7 @@ import services from './services'
 export default {
   [services.node]: 'k8sNode',
   [services.namespace]: 'k8sNamespace',
+  [services.networkPolicy]: 'k8sNetworkPolicy',
   [services.pod]: 'k8sPod',
   [services.deployment]: 'k8sDeployment',
   [services.secret]: 'k8sSecret',
diff --git a/src/enums/serviceMap.ts b/src/enums/serviceMap.ts
@@ -13,10 +13,12 @@ import Secret from '../services/secret'
 import Role from '../services/role'
 import Job from '../services/job'
 import CronJob from '../services/cronJob'
+import NetworkPolicy from '../services/networkPolicy'
 
 export default {
   [services.node]: Node,
   [services.namespace]: Namespace,
+  [services.networkPolicy]: NetworkPolicy,
   [services.pod]: Pod,
   [services.deployment]: Deployment,
   [services.secret]: Secret,
diff --git a/src/enums/services.ts b/src/enums/services.ts
@@ -4,6 +4,7 @@ export default {
   ingress: 'ingress',
   job: 'job',
   namespace: 'namespace',
+  networkPolicy: 'networkPolicy',
   node: 'node',
   persistentVolume: 'persistentVolume',
   persistentVolumeClaim: 'persistentVolumeClaim',
diff --git a/src/services/cronJob/schema.graphql b/src/services/cronJob/schema.graphql
@@ -6,7 +6,7 @@ type k8sCronJob {
   metadata: k8sMetadata
   spec: k8sCronJobSpec
   status: k8sCronJobStatus
-  namespace: [k8sNamespace] @hasInverse(field: cronJob)
+  namespace: [k8sNamespace] @hasInverse(field: cronJobs)
 }
 
 type k8sCronJobSpec {
@@ -17,7 +17,6 @@ type k8sCronJobSpec {
   startingDeadlineSeconds: Int @search
   successfulJobsHistoryLimit: Int @search
   suspend: Boolean @search
-  template: k8sJobTemplate
 }
 
 type k8sCronJobStatus {
diff --git a/src/services/deployment/schema.graphql b/src/services/deployment/schema.graphql
@@ -6,7 +6,7 @@ type k8sDeployment {
   metadata: k8sMetadata
   spec: k8sDeploymentSpec
   status: k8sDeploymentStatus
-  namespace: [k8sNamespace] @hasInverse(field: deployment)
+  namespace: [k8sNamespace] @hasInverse(field: deployments)
 }
 
 type k8sDeploymentSpec {
diff --git a/src/services/index.ts b/src/services/index.ts
@@ -99,7 +99,7 @@ export default class Provider extends CloudGraph.Client {
         'k8s'
       )} configuration successfully completed ${confettiBall}`
     )
-    this.logSelectedAccessRegionsAndResources(result.contexts, result.resources)
+    this.logSelectedAccessRegionsAndResources(result.contexts.map(({ name }) => name), result.resources)
     return result
   }
 
@@ -174,9 +174,7 @@ export default class Provider extends CloudGraph.Client {
       roles: rolesClient
     }
 
-    // rolesClient.listRoleForAllNamespaces
     // networkingClient.listNetworkPolicyForAllNamespaces
-    // batchClient.listCronJobForAllNamespaces
     // client.listConfigMapForAllNamespaces
     // client.listEndpointsForAllNamespaces
     // client.listEventForAllNamespaces
diff --git a/src/services/ingress/schema.graphql b/src/services/ingress/schema.graphql
@@ -6,7 +6,7 @@ type k8sIngress {
   metadata: k8sMetadata
   spec: k8sIngressSpec
   status: k8sIngressStatus
-  namespace: [k8sNamespace] @hasInverse(field: ingress)
+  namespace: [k8sNamespace] @hasInverse(field: ingresses)
 }
 
 type k8sIngressSpec {
diff --git a/src/services/job/schema.graphql b/src/services/job/schema.graphql
@@ -6,7 +6,7 @@ type k8sJob {
   metadata: k8sMetadata
   spec: k8sJobSpec
   status: k8sJobStatus
-  namespace: [k8sNamespace] @hasInverse(field: job)
+  namespace: [k8sNamespace] @hasInverse(field: jobs)
 }
 
 type k8sJobSpec {
diff --git a/src/services/namespace/connections.ts b/src/services/namespace/connections.ts
@@ -3,6 +3,7 @@ import isEmpty from 'lodash/isEmpty'
 import { ServiceConnection } from '@cloudgraph/sdk'
 import { V1Namespace } from '@kubernetes/client-node'
 import services from '../../enums/services'
+import plurals from '../../enums/pluralization'
 
 /**
  * Service Account
@@ -36,7 +37,7 @@ export default ({
             id: service.metadata?.uid,
             resourceType: entity.name,
             relation: 'child',
-            field: entity.name
+            field: plurals[entity.name] ?? entity.name
           })
         }
       }
diff --git a/src/services/namespace/schema.graphql b/src/services/namespace/schema.graphql
@@ -6,19 +6,20 @@ type k8sNamespace {
   metadata: k8sMetadata
   spec: k8sNamespaceSpec
   status: k8sNamespaceStatus
-  node: [k8sNode] @hasInverse(field: namespace)
-  pod: [k8sPod] @hasInverse(field: namespace)
-  deployment: [k8sDeployment] @hasInverse(field: namespace)
-  ingress: [k8sIngress] @hasInverse(field: namespace)
-  secret: [k8sSecret] @hasInverse(field: namespace)
-  service: [k8sService] @hasInverse(field: namespace)
-  serviceAccount: [k8sServiceAccount] @hasInverse(field: namespace)
-  storageClass: [k8sStorageClass] @hasInverse(field: namespace)
-  persistentVolume: [k8sPersistentVolume] @hasInverse(field: namespace)
-  persistentVolumeClaim: [k8sPersistentVolumeClaim] @hasInverse(field: namespace)
-  role: [k8sRole] @hasInverse(field: namespace)
-  job: [k8sJob] @hasInverse(field: namespace)
-  cronJob: [k8sCronJob] @hasInverse(field: namespace)
+  networkPolicies: [k8sNetworkPolicy] @hasInverse(field: namespace)
+  nodes: [k8sNode] @hasInverse(field: namespace)
+  pods: [k8sPod] @hasInverse(field: namespace)
+  deployments: [k8sDeployment] @hasInverse(field: namespace)
+  ingresses: [k8sIngress] @hasInverse(field: namespace)
+  secrets: [k8sSecret] @hasInverse(field: namespace)
+  services: [k8sService] @hasInverse(field: namespace)
+  serviceAccounts: [k8sServiceAccount] @hasInverse(field: namespace)
+  storageClasses: [k8sStorageClass] @hasInverse(field: namespace)
+  persistentVolumes: [k8sPersistentVolume] @hasInverse(field: namespace)
+  persistentVolumeClaims: [k8sPersistentVolumeClaim] @hasInverse(field: namespace)
+  roles: [k8sRole] @hasInverse(field: namespace)
+  jobs: [k8sJob] @hasInverse(field: namespace)
+  cronJobs: [k8sCronJob] @hasInverse(field: namespace)
 }
 
 type k8sNamespaceSpec @generate(
diff --git a/src/services/networkPolicy/data.ts b/src/services/networkPolicy/data.ts
@@ -0,0 +1,22 @@
+import CloudGraph from '@cloudgraph/sdk'
+import { V1NetworkPolicy } from '@kubernetes/client-node'
+import { k8sClient } from '../../types'
+
+const { logger } = CloudGraph
+
+export default async ({
+  config,
+}: { config: { client: k8sClient } }): Promise<V1NetworkPolicy[]> => {
+  const { client,  } = config
+
+  try {
+    const response = await client.networking.listNetworkPolicyForAllNamespaces()
+    const { body: { items = []} = {}} = response ?? {}
+    logger.debug(`Found ${items.length} k8s network policies`)
+
+    return items
+  } catch (e) {
+    logger.debug(e)
+    return []
+  }
+}
diff --git a/src/services/networkPolicy/format.ts b/src/services/networkPolicy/format.ts
@@ -0,0 +1,85 @@
+import cuid from 'cuid'
+import { V1NetworkPolicy, V1NetworkPolicyPeer, V1NetworkPolicyPort } from '@kubernetes/client-node'
+import { K8sNetworkPolicy } from '../../types/generated'
+import { convertObjToArrayWithId } from '../../util'
+import formatMetadata from '../../util/metadata'
+import { formatMatchedExpressionsAndFields } from '../pod/util'
+
+const formatPort = (port: V1NetworkPolicyPort) => {
+  return {
+    id: cuid(),
+    endPort: port?.endPort,
+    port: String(port?.port ?? ''),
+    protocol: port?.protocol
+  }
+}
+
+const formatPolicyPeer = (peer: V1NetworkPolicyPeer) => {
+  return {
+    id: cuid(),
+    ipBlock: {
+      cidr: peer?.ipBlock?.cidr,
+      except: peer?.ipBlock?.except
+    },
+    namespaceSelector: {
+      matchExpressions: formatMatchedExpressionsAndFields(peer?.namespaceSelector?.matchExpressions ?? []),
+      matchLabels: convertObjToArrayWithId(peer?.namespaceSelector?.matchLabels ?? {})
+    },
+    podSelector: {
+      matchExpressions: formatMatchedExpressionsAndFields(peer?.podSelector?.matchExpressions ?? []),
+      matchLabels: convertObjToArrayWithId(peer?.podSelector?.matchLabels ?? {})
+    }
+  }
+}
+export default ({
+  entity,
+  context,
+}: {
+  entity: V1NetworkPolicy
+  context: string
+}): K8sNetworkPolicy => {
+  const {
+    apiVersion,
+    kind,
+    metadata,
+    spec: {
+      egress,
+      ingress,
+      podSelector,
+      policyTypes
+    } = {}
+  } = entity
+
+
+  const formattedMetadata = formatMetadata(metadata)
+  const mappedEgress = egress?.map(({ ports, to })=> ({
+    id: cuid(),
+    ports: ports?.map(formatPort) ?? [],
+    to: to?.map(formatPolicyPeer) ?? []
+  })) ?? []
+
+  const mappedIngress = ingress?.map(({ ports, from })=> ({
+    id: cuid(),
+    ports: ports?.map(formatPort) ?? [],
+    from: from?.map(formatPolicyPeer) ?? []
+  })) ?? []
+
+  const formattedPodSelector = {
+    matchExpressions: formatMatchedExpressionsAndFields(podSelector?.matchExpressions ?? []),
+    matchLabels: convertObjToArrayWithId(podSelector?.matchLabels ?? {})
+  }
+
+  return {
+    id: formattedMetadata.id,
+    apiVersion,
+    kind,
+    context,
+    metadata: formattedMetadata.metadata,
+    spec: {
+      egress: mappedEgress,
+      ingress: mappedIngress,
+      podSelector: formattedPodSelector,
+      policyTypes
+    }
+  }
+}
diff --git a/src/services/networkPolicy/index.ts b/src/services/networkPolicy/index.ts
@@ -0,0 +1,12 @@
+import getData from './data'
+import format from './format'
+import mutation from './mutation'
+
+
+export default class NetworkPolicy {
+  format = format.bind(this)
+
+  getData = getData.bind(this)
+
+  mutation = mutation
+}
diff --git a/src/services/networkPolicy/mutation.ts b/src/services/networkPolicy/mutation.ts
@@ -0,0 +1,5 @@
+export default `mutation($input: [Addk8sNetworkPolicyInput!]!) {
+  addk8sNetworkPolicy(input: $input, upsert: true) {
+    numUids
+  }
+}`;
diff --git a/src/services/networkPolicy/schema.graphql b/src/services/networkPolicy/schema.graphql
@@ -0,0 +1,52 @@
+type k8sNetworkPolicy {
+  id: String! @id @search(by: [hash, regexp])
+  context: String! @search(by: [hash, regexp])
+  apiVersion: String @search(by: [hash, regexp])
+  kind: String @search(by: [hash, regexp])
+  metadata: k8sMetadata
+  spec: k8sNetworkPolicySpec
+  namespace: [k8sNamespace] @hasInverse(field: networkPolicies)
+}
+
+type k8sNetworkPolicySpec {
+  egress: [k8sNetworkPolicyEgress]
+  ingress: [k8sNetworkPolicyIngress]
+  podSelector: k8sDeploymentSelector
+  policyTypes: [String] @search(by: [hash, regexp])
+}
+
+type k8sDeploymentSelector {
+  matchExpressions: [k8sDeploymentExpressions]
+  matchLabels: [k8sKeyValueArray]
+}
+
+type k8sNetworkPolicyEgress {
+  id: String! @id @search(by: [hash, regexp])
+  ports: [k8sNetworkPolicyPort]
+  to: [k8sNetworkPolicyPeer]
+}
+
+type k8sNetworkPolicyIngress {
+  id: String! @id @search(by: [hash, regexp])
+  ports: [k8sNetworkPolicyPort]
+  from: [k8sNetworkPolicyPeer]
+}
+
+type k8sNetworkPolicyPort {
+  id: String! @id @search(by: [hash, regexp])
+  endPort: Int @search
+  port: String @search(by: [hash, regexp])
+  protocol: String @search(by: [hash, regexp])
+}
+
+type k8sNetworkPolicyPeer {
+  id: String! @id @search(by: [hash, regexp])
+  ipBlock: k8sNetworkPolicyPeerIpBlock
+  namespaceSelector: k8sDeploymentSelector
+  podSelector: k8sDeploymentSelector
+}
+
+type k8sNetworkPolicyPeerIpBlock {
+  cidr: String @search(by: [hash, regexp])
+  except: [String] @search(by: [hash, regexp])
+}
diff --git a/src/services/node/schema.graphql b/src/services/node/schema.graphql
@@ -9,7 +9,7 @@ type k8sNode {
   metadata: k8sMetadata
   spec: k8sNodeSpec
   status: k8sNodeStatus
-  namespace: [k8sNamespace] @hasInverse(field: node)
+  namespace: [k8sNamespace] @hasInverse(field: nodes)
 }
 
 type k8sMetadata @generate(
diff --git a/src/services/persistentVolume/schema.graphql b/src/services/persistentVolume/schema.graphql
@@ -6,7 +6,7 @@ type k8sPersistentVolume {
   metadata: k8sMetadata
   spec: k8sPersistentVolumeSpec
   status: k8sPersistentVolumeStatus
-  namespace: [k8sNamespace] @hasInverse(field: persistentVolume)
+  namespace: [k8sNamespace] @hasInverse(field: persistentVolumes)
 }
 
 type k8sPersistentVolumeSpec @generate(
diff --git a/src/services/persistentVolumeClaim/schema.graphql b/src/services/persistentVolumeClaim/schema.graphql
@@ -6,7 +6,7 @@ type k8sPersistentVolumeClaim {
   metadata: k8sMetadata
   spec: k8sPersistentVolumeClaimSpec
   status: k8sPersistentVolumeClaimStatus
-  namespace: [k8sNamespace] @hasInverse(field: persistentVolumeClaim)
+  namespace: [k8sNamespace] @hasInverse(field: persistentVolumeClaims)
 }
 
 type k8sPersistentVolumeClaimSpec @generate(
diff --git a/src/services/pod/schema.graphql b/src/services/pod/schema.graphql
diff --git a/src/services/role/schema.graphql b/src/services/role/schema.graphql
diff --git a/src/services/secret/schema.graphql b/src/services/secret/schema.graphql
diff --git a/src/services/service/schema.graphql b/src/services/service/schema.graphql
diff --git a/src/services/serviceAccount/schema.graphql b/src/services/serviceAccount/schema.graphql
diff --git a/src/services/storageClass/schema.graphql b/src/services/storageClass/schema.graphql
diff --git a/src/types/generated.ts b/src/types/generated.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@cloudgraph/cg-provider-k8s",`
`3`		`- "version": "0.0.1",`
	`3`	`+ "version": "0.0.2",`
`4`	`4`	`"description": "Kubernetes provider for the CloudGraph CLI",`
`5`	`5`	`"publishConfig": {`
`6`	`6`	`"access": "public"`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ type k8sCronJob {`
`6`	`6`	`metadata: k8sMetadata`
`7`	`7`	`spec: k8sCronJobSpec`
`8`	`8`	`status: k8sCronJobStatus`
`9`		`- namespace: [k8sNamespace] @hasInverse(field: cronJob)`
	`9`	`+ namespace: [k8sNamespace] @hasInverse(field: cronJobs)`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`type k8sCronJobSpec {`
`@@ -17,7 +17,6 @@ type k8sCronJobSpec {`
`17`	`17`	`startingDeadlineSeconds: Int @search`
`18`	`18`	`successfulJobsHistoryLimit: Int @search`
`19`	`19`	`suspend: Boolean @search`
`20`		`- template: k8sJobTemplate`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`type k8sCronJobStatus {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ type k8sDeployment {`
`6`	`6`	`metadata: k8sMetadata`
`7`	`7`	`spec: k8sDeploymentSpec`
`8`	`8`	`status: k8sDeploymentStatus`
`9`		`- namespace: [k8sNamespace] @hasInverse(field: deployment)`
	`9`	`+ namespace: [k8sNamespace] @hasInverse(field: deployments)`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`type k8sDeploymentSpec {`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ export default class Provider extends CloudGraph.Client {`
`99`	`99`	`'k8s'`
`100`	`100`	)} configuration successfully completed ${confettiBall}`
`101`	`101`	`)`
`102`		`- this.logSelectedAccessRegionsAndResources(result.contexts, result.resources)`
	`102`	`+ this.logSelectedAccessRegionsAndResources(result.contexts.map(({ name }) => name), result.resources)`
`103`	`103`	`return result`
`104`	`104`	`}`
`105`	`105`
`@@ -174,9 +174,7 @@ export default class Provider extends CloudGraph.Client {`
`174`	`174`	`roles: rolesClient`
`175`	`175`	`}`
`176`	`176`
`177`		`- // rolesClient.listRoleForAllNamespaces`
`178`	`177`	`// networkingClient.listNetworkPolicyForAllNamespaces`
`179`		`- // batchClient.listCronJobForAllNamespaces`
`180`	`178`	`// client.listConfigMapForAllNamespaces`
`181`	`179`	`// client.listEndpointsForAllNamespaces`
`182`	`180`	`// client.listEventForAllNamespaces`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ type k8sIngress {`
`6`	`6`	`metadata: k8sMetadata`
`7`	`7`	`spec: k8sIngressSpec`
`8`	`8`	`status: k8sIngressStatus`
`9`		`- namespace: [k8sNamespace] @hasInverse(field: ingress)`
	`9`	`+ namespace: [k8sNamespace] @hasInverse(field: ingresses)`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`type k8sIngressSpec {`