Merge lp:~matsubara/lp-devops-dashboard/932768-lplib-credential into lp:lp-devops-dashboard

[Diogo Matsubara]

After an update to the download-cache of the devops dashboard, existing launchpadlib credentials weren't used. A new credential file is requested and the existing one ignored. This fix adds the option to use the existing credential file.

Is this the right fix for this issue? Should I get a new credential file using the desktop integration workflow? Is there a way to copy the existing credentials to be used by the desktop workflow?

Thanks!

[Brad Crittenden (bac)]

Hi Diogo,

On IRC we talked about using this credential file vs. the keyring. But since this is running on devpad it may be hard to actually authenticate in that environment. So I think the changes you've made here are the best way to go.

review: Approve (code)

=== modified file 'src/devops/fetchbugs.py'
--- src/devops/fetchbugs.py	2011-06-17 21:36:09 +0000
+++ src/devops/fetchbugs.py	2012-02-15 14:15:59 +0000
@@ -1,6 +1,5 @@
 from launchpadlib.launchpad import Launchpad
 from datetime import datetime, timedelta, date
-import pdb
 
 
 class DayStats:
@@ -75,10 +74,12 @@
         u"Fix Released",
     ]
 
-    def __init__(self, lp_instance="production", lp=None, days_ago=7):
+    def __init__(self, lp_instance="production", lp=None, days_ago=7,
+                 config=None):
         self.days_ago = days_ago
         self.bugs_list = None
         self.lp_instance = lp_instance
+        self.config = config
         try:
             if lp is None:
                 self.initialize_launchpad()
@@ -95,10 +96,9 @@
 
     def initialize_launchpad(self):
         """Initialize the lp attribute."""
-        lplib_login_func = Launchpad.login_with
-        lplib_user = 'dashboard'
-
-        self.lp = lplib_login_func(lplib_user, service_root=self.lp_instance)
+        self.lp = Launchpad.login_with(
+            'dashboard', service_root=self.lp_instance,
+            credentials_file=self.config.lplib_credentials_file)
 
     def fetch_open_critical_bugs(self):
         return self.launchpad_project.searchTasks(importance=[u"Critical"])

=== modified file 'src/devops/generate.py'
--- src/devops/generate.py	2011-06-17 21:36:31 +0000
+++ src/devops/generate.py	2012-02-15 14:15:59 +0000
@@ -67,7 +67,7 @@
             incident_reports = IncidentReports()
             incident_reports.get_last_reports_since()
 
-            critical_bugs = LaunchpadBugs()
+            critical_bugs = LaunchpadBugs(config=self.config_)
             critical_bugs.get_todays_stats()
             critical_bugs.get_last_days_stats()
 

=== modified file 'src/devops/utils.py'
--- src/devops/utils.py	2011-04-22 20:11:06 +0000
+++ src/devops/utils.py	2012-02-15 14:15:59 +0000
@@ -11,6 +11,7 @@
         self.config_file_path = config_file_path
         self.deployment_reports_path = None
         self.devops_index_path = None
+        self.lplib_credentials_file = None
 
     def read_config_file(self):
         config_parser = ConfigParser()
@@ -20,6 +21,8 @@
             "deployment_reports_path")
         self.devops_index_path = config_parser.get("reports",
             "generated_report_path")
+        self.lplib_credentials_file = config_parser.get("credentials",
+            "lplib_credentials_file")
 
 
 def days_ago(date):