Extract dataset.delete and draftset.findDraftset

Fork: 0

ONS / pmd-jenkins-library

Browse code Extract dataset.delete and draftset.findDraftset add_tests master v1.0
1 parent 2ed9676 commit 3ff782e269e470555c566d52b2ce84d4aad73f57 Robin Gower authored on 17 Oct 2018

Patch

Unified Split

Showing 6 changed files

                Ignore Space
               Show notes
              View
            
          
          19 ■■■■■
          vars/dataset.groovy
        
        
        
          0 → 100644
               def delete(String datasetLabel) {
    echo "Deleting dataset graphs from label ${datasetLabel}"
 
    configFileProvider([configFile(fileId: 'pmd', variable: 'configfile')]) {
        def config = readJSON(text: readFile(file: configfile))
        String PMD = config['pmd_api']
        String credentials = config['credentials']
        String baseURI = config['base_uri']
 
        def draftset = drafter.findDraftset(PMD, credentials, env.JOB_NAME) // assume it already exists
 
        String datasetPath = util.slugise(datasetLabel)
        String datasetGraph = "${baseURI}/graph/${datasetPath}"
        String metadataGraph = "${datasetGraph}/metadata"
        drafter.deleteGraph(PMD, credentials, draftset.id, metadataGraph)
        drafter.deleteGraph(PMD, credentials, draftset.id, datasetGraph)
    }
}
+def delete(String datasetLabel) {
+    echo "Deleting dataset graphs from label ${datasetLabel}"
+    configFileProvider([configFile(fileId: 'pmd', variable: 'configfile')]) {
+        def config = readJSON(text: readFile(file: configfile))
+        String PMD = config['pmd_api']
+        String credentials = config['credentials']
+        String baseURI = config['base_uri']
+        def draftset = drafter.findDraftset(PMD, credentials, env.JOB_NAME) // assume it already exists
+        String datasetPath = util.slugise(datasetLabel)
+        String datasetGraph = "${baseURI}/graph/${datasetPath}"
+        String metadataGraph = "${datasetGraph}/metadata"
+        drafter.deleteGraph(PMD, credentials, draftset.id, metadataGraph)
+        drafter.deleteGraph(PMD, credentials, draftset.id, datasetGraph)
+    }
+}

                Ignore Space
               Show notes
              View
            
          
          12 ■■■■■
          vars/drafter.groovy
     if (response.status == 200) {
        return readJSON(text: response.content)
    } else {
        error "Problem listing draftsets ${response.status} : ${response.content}"
    }
}
 
def findDraftset(String baseUrl, String, credentials, String displayName) {
    echo "Finding draftset with display name '${displayName}'"
 
    def draftset = drafter.listDraftsets(baseUrl, credentials, 'owned')
    def draftset = drafts.find  { it['display-name'] == displayName }
    if (draftset) {
        draftset
    } else {
        error "Can't find draftset with the display-name '${displayName}'"
    }
}
 
def deleteDraftset(String baseUrl, String credentials, String id) {
     if (response.status == 200) {
         return readJSON(text: response.content)
     } else {
         error "Problem listing draftsets ${response.status} : ${response.content}"
+    }
+}
+def findDraftset(String baseUrl, String, credentials, String displayName) {
+    echo "Finding draftset with display name '${displayName}'"
+    def draftset = drafter.listDraftsets(baseUrl, credentials, 'owned')
+    def draftset = drafts.find  { it['display-name'] == displayName }
+    if (draftset) {
+        draftset
+    } else {
+        error "Can't find draftset with the display-name '${displayName}'"
     }
 }
 def deleteDraftset(String baseUrl, String credentials, String id) {

                Ignore Space
               Show notes
              View
            
          
          5 ■■■■■
          vars/publishDraftset.groovy
     configFileProvider([configFile(fileId: 'pmd', variable: 'configfile')]) {
        def config = readJSON(text: readFile(file: configfile))
        String PMD = config['pmd_api']
        String credentials = config['credentials']
        def drafts = drafter.listDraftsets(PMD, credentials, 'owned')
        def jobDraft = drafts.find  { it['display-name'] == env.JOB_NAME }
        def jobDraft = drafter.findDraftset(PMD, credentials, env.JOB_NAME)
        if (jobDraft) {
            drafter.publishDraftset(PMD, credentials, jobDraft.id)
        } else {
            error "Expecting a draftset for this job."
        }
    }
}
     configFileProvider([configFile(fileId: 'pmd', variable: 'configfile')]) {
         def config = readJSON(text: readFile(file: configfile))
         String PMD = config['pmd_api']
         String credentials = config['credentials']
+        def drafts = drafter.listDraftsets(PMD, credentials, 'owned')
+        def jobDraft = drafts.find  { it['display-name'] == env.JOB_NAME }
+        def jobDraft = drafter.findDraftset(PMD, credentials, env.JOB_NAME)
         if (jobDraft) {
             drafter.publishDraftset(PMD, credentials, jobDraft.id)
         } else {
             error "Expecting a draftset for this job."
         }
     }
 }

                Ignore Space
               Show notes
              View
            
          
          12 ■■■■■
          vars/uploadCube.groovy
         def config = readJSON(text: readFile(file: configfile))
        String PMD = config['pmd_api']
        String credentials = config['credentials']
        String PIPELINE = config['pipeline_api']
        def drafts = drafter.listDraftsets(PMD, credentials, 'owned')
        def jobDraft = drafts.find { it['display-name'] == env.JOB_NAME }
        def jobDraft = drafts.findDraftset(env.JOB_NAME)
        if (jobDraft) {
            drafter.deleteDraftset(PMD, credentials, jobDraft.id as String)
        }
        def newJobDraft = drafter.createDraftset(PMD, credentials, env.JOB_NAME as String)
        String datasetPath = util.slugise(datasetLabel)
        drafter.deleteGraph(PMD, credentials, newJobDraft.id as String,
                "http://gss-data.org.uk/graph/${datasetPath}/metadata")
        drafter.deleteGraph(PMD, credentials, newJobDraft.id as String,
                "http://gss-data.org.uk/graph/${datasetPath}")
        dataset.delete(datasetLabel)
 
        drafter.addData(PMD, credentials, newJobDraft.id as String,
                readFile("out/dataset.trig"), "application/trig;charset=UTF-8")
        obslist.each { obsfile ->
            echo "Uploading ${obsfile}"
         def config = readJSON(text: readFile(file: configfile))
         String PMD = config['pmd_api']
         String credentials = config['credentials']
         String PIPELINE = config['pipeline_api']
+        def drafts = drafter.listDraftsets(PMD, credentials, 'owned')
+        def jobDraft = drafts.find { it['display-name'] == env.JOB_NAME }
+        def jobDraft = drafts.findDraftset(env.JOB_NAME)
         if (jobDraft) {
             drafter.deleteDraftset(PMD, credentials, jobDraft.id as String)
         }
         def newJobDraft = drafter.createDraftset(PMD, credentials, env.JOB_NAME as String)
         String datasetPath = util.slugise(datasetLabel)
+        drafter.deleteGraph(PMD, credentials, newJobDraft.id as String,
+                "http://gss-data.org.uk/graph/${datasetPath}/metadata")
+        drafter.deleteGraph(PMD, credentials, newJobDraft.id as String,
+                "http://gss-data.org.uk/graph/${datasetPath}")
+        dataset.delete(datasetLabel)
         drafter.addData(PMD, credentials, newJobDraft.id as String,
                 readFile("out/dataset.trig"), "application/trig;charset=UTF-8")
         obslist.each { obsfile ->
             echo "Uploading ${obsfile}"

Ignore Space Show notes View vars/uploadDraftset.groovy

Ignore Space Show notes View vars/uploadTidy.groovy

Show line notes below