You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@trafficcontrol.apache.org by GitBox <gi...@apache.org> on 2020/05/29 19:14:53 UTC

[GitHub] [trafficcontrol] zrhoffman opened a new pull request #4739: Make CDN-in-a-Box enroller use latest TO client

zrhoffman opened a new pull request #4739:
URL: https://github.com/apache/trafficcontrol/pull/4739


   <!--
   ************ STOP!! ************
   If this Pull Request is intended to fix a security vulnerability, DO NOT submit it! Instead, contact
   the Apache Software Foundation Security Team at security@trafficcontrol.apache.org and follow the
   guidelines at https://www.apache.org/security/ regarding vulnerability disclosure.
   -->
   ## What does this PR (Pull Request) do?
   <!-- Explain the changes you made here. If this fixes an Issue, identify it by
   replacing the text in the checkbox item with the Issue number e.g.
   
   - [x] This PR fixes #9001 OR is not related to any Issue
   
   ^ This will automatically close Issue number 9001 when the Pull Request is
   merged (The '#' is important).
   
   Be sure you check the box properly, see the "The following criteria are ALL
   met by this PR" section for details.
   -->
   
   - [x] This PR is not related to any Issue <!-- You can check for an issue here: https://github.com/apache/trafficcontrol/issues -->
   - Updated the CDN-in-a-Box enroller to use the latest TO client library
   - The directories that the enroller copies into the first build stage are now tracked in a dockerignore for easy updating
   
   This fixes something I encountered when testing #4702, which changes the TO client library. The enroller was not using the repo's version of the client library:
   ```go
   #15 0.940 get "golang.org/x/net/publicsuffix": found meta tag get.metaImport{Prefix:"golang.org/x/net", VCS:"git", RepoRoot:"https://go.googlesource.com/net"} at //golang.org/x/net/publicsuffix?go-get=1
   #15 0.940 get "golang.org/x/net/publicsuffix": verifying non-authoritative meta tag
   #15 0.969 golang.org/x/net (download)
   #15 2.591 github.com/kelseyhightower/envconfig (download)
   #15 3.408 get "golang.org/x/sys/unix": found meta tag get.metaImport{Prefix:"golang.org/x/sys", VCS:"git", RepoRoot:"https://go.googlesource.com/sys"} at //golang.org/x/sys/unix?go-get=1
   #15 3.408 get "golang.org/x/sys/unix": verifying non-authoritative meta tag
   #15 3.437 golang.org/x/sys (download)
   #15 4.905 github.com/apache/trafficcontrol/vendor/github.com/lib/pq/oid
   #15 4.905 golang.org/x/sys/internal/unsafeheader
   #15 4.916 github.com/apache/trafficcontrol/vendor/github.com/influxdata/influxdb/pkg/escape
   #15 4.917 github.com/apache/trafficcontrol/vendor/github.com/jmoiron/sqlx/reflectx
   #15 4.920 golang.org/x/sys/unix
   #15 4.920 github.com/apache/trafficcontrol/lib/go-log
   #15 4.923 github.com/apache/trafficcontrol/vendor/github.com/go-ozzo/ozzo-validation
   #15 4.924 github.com/kelseyhightower/envconfig
   #15 4.932 github.com/apache/trafficcontrol/vendor/github.com/asaskevich/govalidator
   #15 4.934 github.com/apache/trafficcontrol/vendor/github.com/lib/pq
   #15 4.939 github.com/apache/trafficcontrol/vendor/github.com/influxdata/influxdb/models
   #15 4.947 golang.org/x/net/publicsuffix
   #15 4.961 github.com/apache/trafficcontrol/lib/go-util
   #15 4.989 github.com/apache/trafficcontrol/vendor/github.com/jmoiron/sqlx
   #15 5.050 github.com/apache/trafficcontrol/lib/go-rfc
   #15 5.081 github.com/apache/trafficcontrol/vendor/github.com/influxdata/influxdb/client/v2
   #15 5.167 github.com/apache/trafficcontrol/vendor/github.com/go-ozzo/ozzo-validation/is
   #15 5.249 github.com/apache/trafficcontrol/lib/go-tc/tovalidate
   #15 5.261 github.com/apache/trafficcontrol/vendor/gopkg.in/fsnotify.v1
   #15 5.280 github.com/apache/trafficcontrol/lib/go-tc
   #15 5.522 github.com/apache/trafficcontrol/traffic_ops/v2-client
   #15 5.743 github.com/apache/trafficcontrol/infrastructure/cdn-in-a-box/enroller
   #15 5.759 # github.com/apache/trafficcontrol/infrastructure/cdn-in-a-box/enroller
   #15 5.759 ./enroller.go:256:9: assignment mismatch: 2 variables but toSession.Session.CreateDeliveryServiceServers returns 3 values
   ```
   
   ## Which Traffic Control components are affected by this PR?
   <!-- Please delete all components from this list that are NOT affected by this
   Pull Request. Also, feel free to add the name of a tool or script that is
   affected but not on the list.
   
   Additionally, if this Pull Request does NOT affect documentation, please
   explain why documentation is not required. -->
   - CDN in a Box
   
   ## What is the best way to verify this PR?
   <!-- Please include here ALL the steps necessary to test your Pull Request. If
   it includes tests (and most should), outline here the steps needed to run the
   tests. If not, lay out the manual testing procedure and please explain why
   tests are unnecessary for this Pull Request. -->
   Build CDN-in-a-Box enroller image, verify that it enrolls servers
   
   ## If this is a bug fix, what versions of Traffic Control are affected?
   <!-- If this PR fixes a bug, please list here all of the affected versions - to
   the best of your knowledge. It's also pretty helpful to include a commit hash
   of where 'master' is at the time this PR is opened (if it affects master),
   because what 'master' means will change over time. For example, if this PR
   fixes a bug that's present in master (at commit hash '1df853c8'), in v4.0.0,
   and in the current 4.0.1 Release candidate (e.g. RC1), then this list would
   look like:
   
   - master (1df853c8)
   - 4.0.0
   - 4.0.1 (RC1)
   
   If you don't know what other versions might have this bug, AND don't know how
   to find the commit hash of 'master', then feel free to leave this section
   blank (or, preferably, delete it entirely).
    -->
   Not a bug fix.
   
   ## The following criteria are ALL met by this PR
   <!-- Check the boxes to signify that the associated statement is true. To
   "check a box", replace the space inside of the square brackets with an 'x'.
   e.g.
   
   - [ x] <- Wrong
   - [x ] <- Wrong
   - [] <- Wrong
   - [*] <- Wrong
   - [x] <- Correct!
   
   -->
   - [x] CDN-in-a-Box is a test, no further tests included
   - [x] This PR does not include documentation because enroller behavior does not change
   - [x] This PR includes an update to CHANGELOG.md
   - [x] This PR includes any and all required license headers
   - [x] This PR does not include a database migration
   - [x] This PR **DOES NOT FIX A SERIOUS SECURITY VULNERABILITY** (see [the Apache Software Foundation's security guidelines](https://www.apache.org/security/) for details)
   <!--
   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.
   -->


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #4739: Make CDN-in-a-Box enroller use repo's TO client library

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on a change in pull request #4739:
URL: https://github.com/apache/trafficcontrol/pull/4739#discussion_r434688628



##########
File path: infrastructure/cdn-in-a-box/enroller/Dockerfile.dockerignore
##########
@@ -0,0 +1,30 @@
+# 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.
+
+# To use this dockerignore:

Review comment:
       Just checked, it's still not used by default, no. Might as well nix the Dockerignore for now since, without it, it would copy the whole repo.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] rawlinp merged pull request #4739: Make CDN-in-a-Box enroller use repo's TO client library

Posted by GitBox <gi...@apache.org>.
rawlinp merged pull request #4739:
URL: https://github.com/apache/trafficcontrol/pull/4739


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on pull request #4739: Make CDN-in-a-Box enroller use repo's TO client library

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on pull request #4739:
URL: https://github.com/apache/trafficcontrol/pull/4739#issuecomment-636175928


   #4700 fixes this too, closing as a duplicate fix.


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #4739: Make CDN-in-a-Box enroller use repo's TO client library

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on a change in pull request #4739:
URL: https://github.com/apache/trafficcontrol/pull/4739#discussion_r432696297



##########
File path: infrastructure/cdn-in-a-box/enroller/Dockerfile
##########
@@ -17,18 +17,12 @@
 
 FROM golang:1.14.2 AS enroller-builder
 
-# enroller source and dependencies
-COPY ./lib/ /go/src/github.com/apache/trafficcontrol/lib/
-COPY ./vendor/ /go/src/github.com/apache/trafficcontrol/vendor/
-COPY ./traffic_ops/client/ /go/src/github.com/apache/trafficcontrol/traffic_ops/v2-client/

Review comment:
       Gotcha. Changed to v2 client in 8f7763330




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] rawlinp commented on a change in pull request #4739: Make CDN-in-a-Box enroller use latest TO client

Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4739:
URL: https://github.com/apache/trafficcontrol/pull/4739#discussion_r432687266



##########
File path: infrastructure/cdn-in-a-box/enroller/Dockerfile
##########
@@ -17,18 +17,12 @@
 
 FROM golang:1.14.2 AS enroller-builder
 
-# enroller source and dependencies
-COPY ./lib/ /go/src/github.com/apache/trafficcontrol/lib/
-COPY ./vendor/ /go/src/github.com/apache/trafficcontrol/vendor/
-COPY ./traffic_ops/client/ /go/src/github.com/apache/trafficcontrol/traffic_ops/v2-client/

Review comment:
       I think the intention was to keep the enroller using the v2 client until it could be updated to use the v3 client (with the breaking servers changes). See https://github.com/apache/trafficcontrol/pull/4700/files#diff-1bafc9163f1489d723b8f430867c0a0dR23




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on a change in pull request #4739: Make CDN-in-a-Box enroller use repo's TO client library

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on a change in pull request #4739:
URL: https://github.com/apache/trafficcontrol/pull/4739#discussion_r434696960



##########
File path: infrastructure/cdn-in-a-box/enroller/Dockerfile.dockerignore
##########
@@ -0,0 +1,30 @@
+# 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.
+
+# To use this dockerignore:

Review comment:
       Changed in f0e79845d1




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman closed pull request #4739: Make CDN-in-a-Box enroller use repo's TO client library

Posted by GitBox <gi...@apache.org>.
zrhoffman closed pull request #4739:
URL: https://github.com/apache/trafficcontrol/pull/4739


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] rawlinp commented on a change in pull request #4739: Make CDN-in-a-Box enroller use repo's TO client library

Posted by GitBox <gi...@apache.org>.
rawlinp commented on a change in pull request #4739:
URL: https://github.com/apache/trafficcontrol/pull/4739#discussion_r434682676



##########
File path: infrastructure/cdn-in-a-box/enroller/Dockerfile.dockerignore
##########
@@ -0,0 +1,30 @@
+# 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.
+
+# To use this dockerignore:

Review comment:
       This makes it seem like it's not used automatically. Is it not?




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [trafficcontrol] zrhoffman commented on pull request #4739: Make CDN-in-a-Box enroller use repo's TO client library

Posted by GitBox <gi...@apache.org>.
zrhoffman commented on pull request #4739:
URL: https://github.com/apache/trafficcontrol/pull/4739#issuecomment-638276829


   Re-opening because this issue affects the master branch now


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org