drafter.findOrCreateDraftset

Fork: 0

ONS / pmd-jenkins-library

Browse code drafter.findOrCreateDraftset add_tests master v1.0
1 parent b3b2c97 commit 7f144d4b4ca82c921fcbc70179157959897a2199 Robin Gower authored on 17 Oct 2018

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          vars/dataset.groovy
         String PMD = config['pmd_api']
        String credentials = config['credentials']
        String baseURI = config['base_uri']
 
        def draftset = drafter.findDraftset(PMD, credentials, env.JOB_NAME as String) // assume it already exists
        def draftset = drafter.findOrCreateDraftset(PMD, credentials, env.JOB_NAME as String) // assume it already exists
 
        String datasetPath = util.slugise(datasetLabel)
        String datasetGraph = "${baseURI}/graph/${datasetPath}"
        String metadataGraph = "${datasetGraph}/metadata"
         String PMD = config['pmd_api']
         String credentials = config['credentials']
         String baseURI = config['base_uri']
+        def draftset = drafter.findDraftset(PMD, credentials, env.JOB_NAME as String) // assume it already exists
+        def draftset = drafter.findOrCreateDraftset(PMD, credentials, env.JOB_NAME as String) // assume it already exists
         String datasetPath = util.slugise(datasetLabel)
         String datasetGraph = "${baseURI}/graph/${datasetPath}"
         String metadataGraph = "${datasetGraph}/metadata"

                Ignore Space
               Show notes
              View
            
          
          12 ■■■■■
          vars/drafter.groovy
     if (draftset) {
        draftset
    } else {
        error "Can't find draftset with the display-name '${displayName}'"
    }
}
 
def findOrCreateDraftset(String baseUrl, String credentials, String displayName) {
    echo "Finding or creating draftset with display name '${displayName}'"
 
    def drafts = listDraftsets(baseUrl, credentials, 'owned')
    def draftset = drafts.find  { it['display-name'] == displayName }
    if (draftset) {
        draftset
    } else {
        createDraftset(baseUrl, credentials, displayName)
    }
}
 
def deleteDraftset(String baseUrl, String credentials, String id) {
     if (draftset) {
         draftset
     } else {
         error "Can't find draftset with the display-name '${displayName}'"
+    }
+}
+def findOrCreateDraftset(String baseUrl, String credentials, String displayName) {
+    echo "Finding or creating draftset with display name '${displayName}'"
+    def drafts = listDraftsets(baseUrl, credentials, 'owned')
+    def draftset = drafts.find  { it['display-name'] == displayName }
+    if (draftset) {
+        draftset
+    } else {
+        createDraftset(baseUrl, credentials, displayName)
     }
 }
 def deleteDraftset(String baseUrl, String credentials, String id) {

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          vars/uploadTidy.groovy
         } catch(e) {
            echo 'No old job draft to delete'
        }
 
        def newJobDraft = drafter.createDraftset(PMD, credentials, env.JOB_NAME)
        def newJobDraft = drafter.findOrCreateDraftset(PMD, credentials, env.JOB_NAME)
 
        dataset.delete(env.JOB_NAME)
        if (oldLabel) {
            dataset.delete(oldLabel)
         } catch(e) {
             echo 'No old job draft to delete'
         }
+        def newJobDraft = drafter.createDraftset(PMD, credentials, env.JOB_NAME)
+        def newJobDraft = drafter.findOrCreateDraftset(PMD, credentials, env.JOB_NAME)
         dataset.delete(env.JOB_NAME)
         if (oldLabel) {
             dataset.delete(oldLabel)

Show line notes below