launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:remove-poppy-remnants into launchpad:master.

Commit message:
Remove remnants of poppy

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/387223

The old lp.poppy upload daemon was split out to txpkgupload in 2015, but we had to retain a few bits and pieces for as long as lp-production-configs still referenced it.  That's done now, so we can finish cleaning up.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:remove-poppy-remnants into launchpad:master.

diff --git a/configs/development/launchpad-lazr.conf b/configs/development/launchpad-lazr.conf
index 7b01979..0e239fc 100644
--- a/configs/development/launchpad-lazr.conf
+++ b/configs/development/launchpad-lazr.conf
@@ -157,12 +157,6 @@ private_root: /var/tmp/ppa
 base_url: http://ppa.launchpad.test
 private_base_url: http://private-ppa.launchpad.test
 
-[poppy]
-authentication_endpoint: http://xmlrpc-private.launchpad.test:8087/authserver
-host_key_private=lib/lp/poppy/tests/poppy-sftp
-host_key_public=lib/lp/poppy/tests/poppy-sftp.pub
-port: tcp:5023
-
 [rabbitmq]
 launch: True
 host: localhost:56720
diff --git a/configs/development/txpkgupload-sftp.pub b/configs/development/txpkgupload-sftp.pub
index 5ab1450..8dca78a 100644
--- a/configs/development/txpkgupload-sftp.pub
+++ b/configs/development/txpkgupload-sftp.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAqf2hMqZMGgW30DFJTKMFW6ybTu2BR+uCCmRcc4w5F6kTlk+yCwrC2xUPKMP++ys+NQWCluY7+JWW7kubGn5GT78lLGURnkIDxMEA4dsLypc6n2VPxMVjCDycPPGG8+U4Ljs2BS9Z4JHmcOtPCna0qfEHTDb6f7dhUveJmS+zQay/Cm3+kLBm+L0cdYsH2bXcBjuWHGMbgyow8mLvTKVwAVHK9B3WfhiiAfFpw1ep0p/HE5ZvmLFN+jcmmWPylZocch5tb13HhzbwQjOsnSkpdvNV7K5FHCJ5CZpXNcTAuk6yoR/lQZ86giAFbZ9Yjm4XCrTtZL3HcNEOOPtnPX8lgw== poppy-test-key
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAqf2hMqZMGgW30DFJTKMFW6ybTu2BR+uCCmRcc4w5F6kTlk+yCwrC2xUPKMP++ys+NQWCluY7+JWW7kubGn5GT78lLGURnkIDxMEA4dsLypc6n2VPxMVjCDycPPGG8+U4Ljs2BS9Z4JHmcOtPCna0qfEHTDb6f7dhUveJmS+zQay/Cm3+kLBm+L0cdYsH2bXcBjuWHGMbgyow8mLvTKVwAVHK9B3WfhiiAfFpw1ep0p/HE5ZvmLFN+jcmmWPylZocch5tb13HhzbwQjOsnSkpdvNV7K5FHCJ5CZpXNcTAuk6yoR/lQZ86giAFbZ9Yjm4XCrTtZL3HcNEOOPtnPX8lgw== txpkgupload-test-key
diff --git a/lib/lp/archiveuploader/uploadpolicy.py b/lib/lp/archiveuploader/uploadpolicy.py
index 1fd3c7a..e7e2f8d 100644
--- a/lib/lp/archiveuploader/uploadpolicy.py
+++ b/lib/lp/archiveuploader/uploadpolicy.py
@@ -185,7 +185,7 @@ class AbstractUploadPolicy:
 
 
 class InsecureUploadPolicy(AbstractUploadPolicy):
-    """The insecure upload policy is used by the poppy interface."""
+    """The insecure upload policy is used by the txpkgupload interface."""
 
     name = 'insecure'
     accepted_type = ArchiveUploadType.SOURCE_ONLY
diff --git a/lib/lp/archiveuploader/uploadprocessor.py b/lib/lp/archiveuploader/uploadprocessor.py
index 752df0a..19e2e5d 100644
--- a/lib/lp/archiveuploader/uploadprocessor.py
+++ b/lib/lp/archiveuploader/uploadprocessor.py
@@ -4,8 +4,8 @@
 """Code for 'processing' 'uploads'. Also see nascentupload.py.
 
 Uploads are directories in the 'incoming' queue directory. They may have
-arrived manually from a distribution contributor, via a poppy upload, or
-they may have come from a build.
+arrived manually from a distribution contributor via txpkgupload, or they
+may have come from a build.
 
 Within an upload, we may find no changes file, one, or several. One is
 the usual number. To process the upload, we process each changes file
diff --git a/lib/lp/services/config/schema-lazr.conf b/lib/lp/services/config/schema-lazr.conf
index ffd76d7..24118e8 100644
--- a/lib/lp/services/config/schema-lazr.conf
+++ b/lib/lp/services/config/schema-lazr.conf
@@ -1437,42 +1437,6 @@ dbuser: poimport
 statement_timeout: 300
 
 
-[poppy]
-# The URL of the XML-RPC endpoint that handles authentication of SSH
-# users. This should implement IAuthServer.
-#
-# datatype: string
-authentication_endpoint: none
-
-# The absolute path to the private key used for the SFTP server.
-# datatype: string
-host_key_private: none
-
-# The absolute path to the public key used for the SFTP server.
-# datatype: string
-host_key_public: none
-
-# datatype: string
-banner: none
-
-# datatype: string
-port: tcp:5022
-
-# datatype: string
-ftp_port: 2121
-
-# The poppy access log location. Information such as connection, SSH
-# login and session start times will be logged here.
-access_log: /tmp/poppy-access.log
-
-# SSH connections that are idle for more than this many seconds are
-# disconnected.
-idle_timeout: 3600
-
-# Where on the filesystem do uploads live?
-fsroot: none
-
-
 [processmail]
 # The database user which will be used by this process.
 # datatype: string
diff --git a/lib/lp/soyuz/doc/soyuz-upload.txt b/lib/lp/soyuz/doc/soyuz-upload.txt
index 4f3b0bc..4b366f1 100644
--- a/lib/lp/soyuz/doc/soyuz-upload.txt
+++ b/lib/lp/soyuz/doc/soyuz-upload.txt
@@ -136,7 +136,7 @@ files match the uploaded ones.
     ...         assert get_md5(filename) == get_md5(upload_filename)
 
 Finally, we'll just create an entirely empty upload folder. We rely for
-our tests on a poppy-like naming system, ie. that the upload folder
+our tests on a txpkgupload-like naming system, ie. that the upload folder
 end with 000004 (being our fourth upload).
 
     >>> os.mkdir("%s/fake_upload_000004" % incoming_dir)