houshengbo closed pull request #698: Remove verifier.go to confirm no test 
impact.
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/698
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/deployers/verifier.go b/deployers/verifier.go
deleted file mode 100644
index 47438153..00000000
--- a/deployers/verifier.go
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package deployers
-
-import (
-       "fmt"
-
-       "github.com/apache/incubator-openwhisk-client-go/whisk"
-)
-
-// The verifier will filter the deployer against the target DeploymentProject
-// the deployer will query the OpenWhisk platform for already deployed 
entities.
-// We assume the deployer and the manifest are targeted for the same namespace.
-type Verifier struct {
-}
-
-type Filter interface {
-       // Perform some filter.
-       Filter(deployer *ServiceDeployer, target *DeploymentProject) (filtered 
*DeploymentProject, err error)
-       // Perform some queries.
-       Query(deployer *ServiceDeployer) (da *DeploymentProject, err error)
-}
-
-func (vf *Verifier) Query(deployer *ServiceDeployer) (da *DeploymentProject, 
err error) {
-       pkgoptions := &whisk.PackageListOptions{false, 0, 0, 0, false}
-       packages, _, err := deployer.Client.Packages.List(pkgoptions)
-
-       da = NewDeploymentProject()
-       for _, pa := range packages {
-               deppack := NewDeploymentPackage()
-               deppack.Package, _ = convert(&pa)
-               da.Packages[pa.Name] = deppack
-       }
-       return da, nil
-}
-
-// TODO() function supposedly returns an error, but never does
-func (vf *Verifier) Filter(deployer *ServiceDeployer, target 
*DeploymentProject) (rs *DeploymentProject, err error) {
-       //substract
-       for _, pa := range target.Packages {
-               for _, dpa := range deployer.Deployment.Packages {
-                       if pa.Package.Name == dpa.Package.Name {
-                               delete(target.Packages, dpa.Package.Name)
-                       }
-               }
-       }
-
-       depApp := NewDeploymentProject()
-       // TODO() i18n
-       fmt.Printf("Target Packages are %#v\n", target.Packages)
-       depApp.Packages = target.Packages
-       return depApp, nil
-}
-
-// Convert whisk.package to whisk.SentPackageNoPublish
-// TODO() function supposedly returns an error, but never does
-// TODO() return value named "sentpackage" is instead "sp"
-func convert(pa *whisk.Package) (sentpackage *whisk.Package, err error) {
-       sp := &whisk.Package{}
-       sp.Name = pa.Name
-       sp.Annotations = pa.Annotations
-       sp.Parameters = pa.Parameters
-       sp.Version = pa.Version
-       return sp, nil
-}


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

Reply via email to